WebUI: Move focus_manager to last user (arc_support)

This file is pre-JS modules and is also only used by one UI. Move it there and remove from the shared resources. Bug: 1173575 Change-Id: Idf1e6e11b43edc22421d73245f5ab591726fe577 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3866374 Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org> Commit-Queue: Rebekah Potter <rbpotter@chromium.org> Cr-Commit-Position: refs/heads/main@{#1041734}
Denger-Network · Aug 31, 2022 · 8d0e7bf · 8d0e7bf
1 parent 865e6b5
commit 8d0e7bf
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 19 deletions.
diff --git a/ui/webui/resources/js/cr/ui/focus_manager.js → ...ces/chromeos/arc_support/focus_manager.js b/ui/webui/resources/js/cr/ui/focus_manager.js → ...ces/chromeos/arc_support/focus_manager.js
diff --git a/chrome/browser/resources/chromeos/arc_support/main.html b/chrome/browser/resources/chromeos/arc_support/main.html
@@ -21,7 +21,7 @@
   <script src="bubble.js"></script>
   <script src="bubble_button.js"></script>
   <script src="overlay.js"></script>
-  <script src="chrome://resources/js/cr/ui/focus_manager.js"></script>
+  <script src="focus_manager.js"></script>
   <script type="module" src="main.js"></script>
   <script src="arc_optin_focus_manager.js"></script>
   <script src="controlled_indicator.js"></script>

diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
@@ -55,7 +55,8 @@
         <include name="IDR_ARC_SUPPORT_PLAYSTORE_LOGO" file="chromeos/arc_support/icon/playstore.svg" type="BINDATA" />
         <include name="IDR_ARC_SUPPORT_PROGRESSBAR_CSS" file="chromeos/arc_support/progressbar.css" type="BINDATA" />
         <include name="IDR_ARC_SUPPORT_PROGRESSBAR_JS" file="chromeos/arc_support/progressbar.js" type="BINDATA" />
-        <include name="IDR_ARC_SUPPORT_FOCUS_MANAGER_JS" file="chromeos/arc_support/arc_optin_focus_manager.js" type="BINDATA" />
+        <include name="IDR_ARC_SUPPORT_ARC_OPTIN_FOCUS_MANAGER_JS" file="chromeos/arc_support/arc_optin_focus_manager.js" type="BINDATA" />
+        <include name="IDR_ARC_SUPPORT_FOCUS_MANAGER_JS" file="chromeos/arc_support/focus_manager.js" type="BINDATA" />
         <include name="IDR_ARC_SUPPORT_LAYOUT_STYLE" file="chromeos/arc_support/layout_style.css" type="BINDATA" />
         <include name="IDR_ARC_SUPPORT_MAIN" file="chromeos/arc_support/main.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
         <include name="IDR_ARC_SUPPORT_ICON_32" file="chromeos/arc_support/icon/32.png" type="BINDATA" />

diff --git a/ui/webui/resources/html/BUILD.gn b/ui/webui/resources/html/BUILD.gn
@@ -22,7 +22,6 @@ generate_grd("build_grdp") {
       "cr.html",
       "cr/event_target.html",
       "cr/ui.html",
-      "cr/ui/focus_manager.html",
       "event_tracker.html",
       "promise_resolver.html",
       "util.html",

diff --git a/ui/webui/resources/html/cr/ui/focus_manager.html b/ui/webui/resources/html/cr/ui/focus_manager.html
diff --git a/ui/webui/resources/js/cr/ui/BUILD.gn b/ui/webui/resources/js/cr/ui/BUILD.gn
@@ -67,7 +67,6 @@ preprocess_if_expr("preprocess_src") {
 
   if (is_chromeos_ash) {
     in_files += [
-      "focus_manager.js",
       "store_client.js",
       "store.js",
     ]
@@ -76,20 +75,6 @@ preprocess_if_expr("preprocess_src") {
 
 group("closure_compile") {
   deps = [ ":ui_resources_modules" ]
-  if (is_chromeos_ash) {
-    deps += [ ":ui_resources" ]
-  }
-}
-
-if (is_chromeos_ash) {
-  js_type_check("ui_resources") {
-    uses_legacy_modules = true
-    deps = [ ":focus_manager" ]
-  }
-
-  js_library("focus_manager") {
-    deps = [ "../..:cr" ]
-  }
 }
 
 js_type_check("ui_resources_modules") {