WebUI cleanup: Move cr.ui.pageManager to bluetooth_internals/.

There are no other usages of PageManager and Page. Given that these
are old WebUI UI elements that are no longer encouraged, moving them
guarantees that no new dependencies to those elements will be
introduced.

This is also in preparation of eliminating HTML Imports from
bluetooth_intarnals/. Moving these elements simplifies things, since
there is no need to auto-generate JS Modules version of such elements
at build time, if no other usages exist.

Bug: 937747
Change-Id: I73152dab8dae65ee8ad465e5d0d018420df18f2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1860780
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: John Lee <johntlee@chromium.org>
Reviewed-by: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706041}

chrome/browser/resources/bluetooth_internals/BUILD.gn

@@ -33,14 +33,33 @@ js_library("bluetooth_internals") {
   ]
 
   deps = [
+    ":page",
+    ":page_manager",
     "//chrome/browser/ui/webui/bluetooth_internals:mojo_bindings_js_library_for_compile",
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:util",
     "//ui/webui/resources/js/cr/ui:array_data_model",
     "//ui/webui/resources/js/cr/ui:list",
     "//ui/webui/resources/js/cr/ui:list_item",
-    "//ui/webui/resources/js/cr/ui/page_manager:page",
-    "//ui/webui/resources/js/cr/ui/page_manager:page_manager",
+  ]
+}
+
+js_library("page") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:util",
+    "//ui/webui/resources/js/cr:event_target",
+    "//ui/webui/resources/js/cr/ui:bubble",
+    "//ui/webui/resources/js/cr/ui:focus_outline_manager",
+    "//ui/webui/resources/js/cr/ui:node_utils",
+    "//ui/webui/resources/js/cr/ui:overlay",
+  ]
+}
+
+js_library("page_manager") {
+  deps = [
+    ":page",
+    "//ui/webui/resources/js:cr",
   ]
 }
 

chrome/browser/resources/bluetooth_internals/bluetooth_internals.html

@@ -20,8 +20,10 @@
   <link rel="import" href="chrome://resources/html/cr/ui/list_item.html">
   <link rel="import" href="chrome://resources/html/cr/ui/list.html">
   <link rel="import" href="chrome://resources/html/cr/ui/overlay.html">
-  <link rel="import" href="chrome://resources/html/cr/ui/page_manager/page_manager.html">
-  <link rel="import" href="chrome://resources/html/cr/ui/page_manager/page.html">
+
+  <link rel="import" href="page_manager.html">
+  <link rel="import" href="page.html">
+
   <link rel="import" href="chrome://resources/html/util.html">
   <link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
 

chrome/browser/resources/bluetooth_internals/page.html

+<script src="page.js"></script>

chrome/browser/resources/bluetooth_internals/page_manager.html

+<script src="page_manager.js"></script>

chrome/browser/resources/bluetooth_internals/resources.grd

@@ -93,6 +93,23 @@
                file="object_fieldset.js"
                type="BINDATA"
                compress="gzip" />
+      <include name="IDR_BLUETOOTH_INTERNALS_PAGE_MANAGER_HTML"
+               file="page_manager.html"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_BLUETOOTH_INTERNALS_PAGE_MANAGER_JS"
+               file="page_manager.js"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_BLUETOOTH_INTERNALS_PAGE_HTML"
+               file="page.html"
+               type="BINDATA"
+               compress="gzip" />
+      <include name="IDR_BLUETOOTH_INTERNALS_PAGE_JS"
+               file="page.js"
+               type="BINDATA"
+               compress="gzip" />
+
       <include name="IDR_BLUETOOTH_INTERNALS_SERVICE_LIST_JS"
                file="service_list.js"
                type="BINDATA"

ui/webui/resources/html/cr/ui/page_manager/page.html

-<script src="../../../../js/cr/ui/page_manager/page.js"></script>

ui/webui/resources/html/cr/ui/page_manager/page_manager.html

-<script src="../../../../js/cr/ui/page_manager/page_manager.js"></script>

ui/webui/resources/js/cr/ui/BUILD.gn

@@ -9,7 +9,6 @@ group("closure_compile") {
   deps = [
     ":ui_resources",
     ":ui_resources_modules",
-    "page_manager:closure_compile",
   ]
 }
 

ui/webui/resources/js/cr/ui/page_manager/BUILD.gn

-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":page",
-    ":page_manager",
-  ]
-}
-
-js_library("page") {
-  deps = [
-    "../:bubble",
-    "../:focus_outline_manager",
-    "../:node_utils",
-    "../:overlay",
-    "../..:event_target",
-    "../../..:cr",
-    "../../..:util",
-  ]
-}
-
-js_library("page_manager") {
-  deps = [
-    ":page",
-    "../../..:cr",
-  ]
-}

ui/webui/resources/webui_resources.grd

@@ -264,12 +264,6 @@ without changes to the corresponding grd file. -->
       <structure name="IDR_WEBUI_HTML_CR_UI_OVERLAY"
                  file="html/cr/ui/overlay.html" type="chrome_html"
                  compress="gzip" />
-      <structure name="IDR_WEBUI_HTML_CR_UI_PAGE_MANAGER_PAGE"
-                 file="html/cr/ui/page_manager/page.html" type="chrome_html"
-                 compress="gzip" />
-      <structure name="IDR_WEBUI_HTML_CR_UI_PAGE_MANAGER_PAGE_MANAGER"
-                 file="html/cr/ui/page_manager/page_manager.html"
-                 type="chrome_html" compress="gzip" />
       <structure name="IDR_WEBUI_HTML_CR_UI_POSITION_UTIL"
                  file="html/cr/ui/position_util.html" type="chrome_html"
                  compress="gzip" />
@@ -389,12 +383,6 @@ without changes to the corresponding grd file. -->
       <structure name="IDR_WEBUI_JS_CR_UI_OVERLAY"
                  file="js/cr/ui/overlay.js" type="chrome_html"
                  compress="gzip" />
-      <structure name="IDR_WEBUI_JS_CR_UI_PAGE_MANAGER_PAGE"
-                 file="js/cr/ui/page_manager/page.js" type="chrome_html"
-                 compress="gzip" flattenhtml="true" />
-      <structure name="IDR_WEBUI_JS_CR_UI_PAGE_MANAGER_PAGE_MANAGER"
-                 file="js/cr/ui/page_manager/page_manager.js" type="chrome_html"
-                 compress="gzip" />
       <structure name="IDR_WEBUI_JS_CR_UI_POSITION_UTIL"
                  file="js/cr/ui/position_util.js" type="chrome_html"
                  compress="gzip" />