[Read Anything] Remove ui/accessibility mojo files from use in WebUI.

These files were added as part of a multi-step effort to transition Read Anything to use gin bindings to communicate with the WebUI. In order to complete this effort, we needed to expose the ui/accessibility mojo files temporarily for use in WebUI, as the WebUI temporarily received an AXTreeUpdate. This code has since been removed at the completion of that effort. This CL is close to a revert of crrev.com/c/3710633. Bug: 1266555 Change-Id: I14aa5d44f3bd8a4fa818c6c824ee18fed626e2ed Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3766864 Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org> Commit-Queue: Abigail Klein <abigailbklein@google.com> Reviewed-by: Mark Schillaci <mschillaci@google.com> Cr-Commit-Position: refs/heads/main@{#1025349}
qweri0p · Jul 18, 2022 · dd42abc · dd42abc
1 parent dad230d
commit dd42abc
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 37 deletions.
diff --git a/content/BUILD.gn b/content/BUILD.gn
@@ -104,11 +104,6 @@ grit("content_resources") {
     "//url/mojom:url_mojom_origin_js",
     "//url/mojom:url_mojom_origin_webui_js",
   ]
-
-  # TODO(abigailbklein): Remove this when ReadAnythingAppController is wired up.
-  if (!is_android) {
-    deps += [ "//ui/gfx/mojom:mojom_js" ]
-  }
 }
 
 grit("dev_ui_content_resources") {

diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc
@@ -52,11 +52,6 @@ const std::set<int> GetContentResourceIds() {
       IDR_URL_MOJO_HTML,
       IDR_URL_MOJO_JS,
 #endif  // !BUILDFLAG(IS_CHROMEOS_ASH)
-
-// TODO(abigailbklein): Remove this when ReadAnythingAppController is wired up.
-#if !BUILDFLAG(IS_ANDROID)
-      IDR_TRANSFORM_MOJO_WEBUI_JS,
-#endif
   };
 }
 

diff --git a/content/content_resources.grd b/content/content_resources.grd
@@ -36,11 +36,6 @@ Other resources that belong in this file:
       <include name="IDR_ORIGIN_MOJO_WEBUI_JS" file="${root_gen_dir}/mojom-webui/url/mojom/origin.mojom-webui.js" resource_path="mojo/url/mojom/origin.mojom-webui.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_RANGE_MOJOM_WEBUI_JS" file="${root_gen_dir}/mojom-webui/ui/gfx/range/mojom/range.mojom-webui.js" resource_path="mojo/ui/gfx/range/mojom/range.mojom-webui.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_TOKEN_MOJO_WEBUI_JS" file="${root_gen_dir}/mojom-webui/mojo/public/mojom/base/token.mojom-webui.js" resource_path="mojo/mojo/public/mojom/base/token.mojom-webui.js" use_base_dir="false" type="BINDATA" />
-      <!-- TODO(abigailbklein): Remove this when ReadAnythingAppController is
-       wired up. -->
-      <if expr="not is_android">
-        <include name="IDR_TRANSFORM_MOJO_WEBUI_JS" file="${root_gen_dir}/mojom-webui/ui/gfx/mojom/transform.mojom-webui.js" resource_path="mojo/ui/gfx/mojom/transform.mojom-webui.js" use_base_dir="false" type="BINDATA" />
-      </if>
       <if expr="chromeos_ash">
         <include name="IDR_UI_WINDOW_OPEN_DISPOSITION_MOJO_JS" file="${root_gen_dir}/ui/base/mojom/window_open_disposition.mojom-lite.js" resource_path="mojo/ui/base/mojom/window_open_disposition.mojom-lite.js" use_base_dir="false" type="BINDATA" />
       </if>

diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
@@ -272,7 +272,7 @@
     "includes": [1930],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/side_panel_resources.grd": {
-    "META": {"sizes": {"includes": [40],}},
+    "META": {"sizes": {"includes": [20],}},
     "includes": [1935],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings/chromeos/os_settings_resources.grd": {

diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
@@ -22,22 +22,12 @@ if (is_win) {
 mojom("ax_constants_mojo") {
   generate_java = true
   sources = [ "ax_constants.mojom" ]
-
-  # TODO(abigailbklein): Remove this when ReadAnythingAppController is wired up.
-  if (!is_android) {
-    webui_module_path = "/"
-  }
 }
 
 mojom_component("ax_enums_mojo") {
   generate_java = true
   sources = [ "ax_enums.mojom" ]
 
-  # TODO(abigailbklein): Remove this when ReadAnythingAppController is wired up.
-  if (!is_android) {
-    webui_module_path = "/"
-  }
-
   macro_prefix = "UI_ACCESSIBILITY_AX_MOJOM"
   output_prefix = "ui_accessibility_ax_mojom"
 }

diff --git a/ui/accessibility/mojom/BUILD.gn b/ui/accessibility/mojom/BUILD.gn
@@ -27,11 +27,6 @@ mojom("mojom") {
     "//url/mojom:url_mojom_gurl",
   ]
 
-  # TODO(abigailbklein): Remove this when ReadAnythingAppController is wired up.
-  if (!is_android) {
-    webui_module_path = "/"
-  }
-
   cpp_typemaps = [
     {
       types = [

diff --git a/ui/webui/resources/mojo/BUILD.gn b/ui/webui/resources/mojo/BUILD.gn
@@ -61,12 +61,6 @@ ts_library("library") {
       "//ui/gfx/range/mojom:mojom_js__generator",
     ]
   }
-
-  # TODO(abigailbklein): Remove this when ReadAnythingAppController is wired up.
-  if (!is_android) {
-    in_files += [ "ui/gfx/mojom/transform.mojom-webui.js" ]
-    extra_deps += [ "//ui/gfx/mojom:mojom_js__generator" ]
-  }
 }
 
 # Copy bindings.d.ts file under the same location where other shared Mojo JS