diff --git a/ui/webui/resources/js/cr/ui/focus_manager.js b/chrome/browser/resources/chromeos/arc_support/focus_manager.js
similarity index 100%
rename from ui/webui/resources/js/cr/ui/focus_manager.js
rename to chrome/browser/resources/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
index ef62729f293f13..1aeedbb0b8df5c 100644
--- 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
index e9f817da73b6ed..d0516b264f9c60 100644
--- 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
index 09eff789984c67..50308e10254b40 100644
--- 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
deleted file mode 100644
index 2d5181c7b3b5fd..00000000000000
--- a/ui/webui/resources/html/cr/ui/focus_manager.html
+++ /dev/null
@@ -1 +0,0 @@
-<script src="../../../js/cr/ui/focus_manager.js"></script>
diff --git a/ui/webui/resources/js/cr/ui/BUILD.gn b/ui/webui/resources/js/cr/ui/BUILD.gn
index 5123ab986de808..59ea2c329cc1f1 100644
--- 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") {