WebUI: Check-in modularized code for ChromeOS multidevice components

Bug: chromium:1184053, chromium:1180979 Test: out/Default/browser_tests --gtest_filter="*MultiDeviceSetup*" Test: Manual test of multidevice setup page in OOBE Change-Id: If33056f308b372f4e586a675d178b8b10902cc25 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3866810 Reviewed-by: Jon Mann <jonmann@chromium.org> Commit-Queue: Wes Okuhara <wesokuhara@google.com> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org> Cr-Commit-Position: refs/heads/main@{#1042701}
Denger-Network · Sep 2, 2022 · 0fba766 · 0fba766
1 parent b519185
commit 0fba766
Show file tree

Hide file tree

Showing 38 changed files with 1,085 additions and 1,234 deletions.
diff --git a/chrome/browser/resources/chromeos/login/oobe_auto_imports.gni b/chrome/browser/resources/chromeos/login/oobe_auto_imports.gni
@@ -92,6 +92,23 @@ oobe_namespace_rewrites = [
 ]
 
 oobe_migrated_imports = [
+  "ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_enter_code_page.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/button_bar.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/mojo_api.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.html",
+  "ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html",
+  "ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html",
+  "ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard.html",
+  "ui/webui/resources/cr_components/chromeos/quick_unlock/setup_pin_keyboard.html",
   "ui/webui/resources/cr_elements/action_link.css.html",
   "ui/webui/resources/cr_elements/cr_button/cr_button.html",
   "ui/webui/resources/cr_elements/cr_checkbox/cr_checkbox.html",
@@ -109,8 +126,4 @@ oobe_migrated_imports = [
   "ui/webui/resources/cr_elements/cr_shared_style.css.html",
   "ui/webui/resources/cr_elements/cr_toggle/cr_toggle.html",
   "ui/webui/resources/cr_elements/md_select.css.html",
-  "ui/webui/resources/cr_components/chromeos/bluetooth/bluetooth_pairing_enter_code_page.html",
-  "ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html",
-  "ui/webui/resources/cr_components/chromeos/quick_unlock/pin_keyboard.html",
-  "ui/webui/resources/cr_components/chromeos/quick_unlock/setup_pin_keyboard.html",
 ]
diff --git a/chrome/browser/resources/chromeos/login/screens/common/BUILD.gn b/chrome/browser/resources/chromeos/login/screens/common/BUILD.gn
@@ -375,9 +375,9 @@ js_library("multidevice_setup.m") {
     "../../components/buttons:oobe_next_button.m",
     "../../components/buttons:oobe_text_button.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:mojo_api.m",
-    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup.m",
-    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_delegate.m",
+    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:mojo_api",
+    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup",
+    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_delegate",
   ]
   extra_deps = [ ":multidevice_setup_module" ]
 }
@@ -757,6 +757,7 @@ polymer_modulizer("multidevice_setup") {
   html_file = "multidevice_setup.html"
   html_type = "dom-module"
   auto_imports = oobe_auto_imports
+  migrated_imports = oobe_migrated_imports
   namespace_rewrites = oobe_namespace_rewrites
 }
 

diff --git a/chrome/browser/resources/chromeos/multidevice_setup/BUILD.gn b/chrome/browser/resources/chromeos/multidevice_setup/BUILD.gn
@@ -89,16 +89,16 @@ js_library("multidevice_setup_post_oobe") {
   deps = [
     ":post_oobe_delegate",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup.m",
-    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_delegate.m",
-    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_shared_css.m",
+    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup",
+    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_delegate",
+    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_shared_css",
   ]
 }
 
 js_library("post_oobe_delegate") {
   deps = [
-    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:mojo_api.m",
-    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_delegate.m",
+    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:mojo_api",
+    "//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_delegate",
   ]
 }
 

diff --git a/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_post_oobe.js b/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_post_oobe.js
@@ -6,8 +6,8 @@ import 'chrome://resources/cr_elements/cr_button/cr_button.js';
 import './strings.m.js';
 
 import {loadTimeData} from '//resources/js/load_time_data.m.js';
-import {PageName} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup.m.js';
-import {MultiDeviceSetupDelegate} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.m.js';
+import {PageName} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup.js';
+import {MultiDeviceSetupDelegate} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.js';
 import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 

diff --git a/chrome/browser/resources/chromeos/multidevice_setup/post_oobe_delegate.js b/chrome/browser/resources/chromeos/multidevice_setup/post_oobe_delegate.js
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {MojoInterfaceProviderImpl} from 'chrome://resources/cr_components/chromeos/multidevice_setup/mojo_api.m.js';
-import {MultiDeviceSetupDelegate} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.m.js';
+import {MojoInterfaceProviderImpl} from 'chrome://resources/cr_components/chromeos/multidevice_setup/mojo_api.js';
+import {MultiDeviceSetupDelegate} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
 import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';

diff --git a/chrome/test/data/webui/cr_components/chromeos/multidevice_setup/integration_test.js b/chrome/test/data/webui/cr_components/chromeos/multidevice_setup/integration_test.js
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 import 'chrome://multidevice-setup/strings.m.js';
-import 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup.m.js';
+import 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup.js';
 
-import {FakeMojoService} from 'chrome://resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.m.js';
-import {BrowserProxyImpl} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.m.js';
+import {FakeMojoService} from 'chrome://resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.js';
+import {BrowserProxyImpl} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {FakeQuickUnlockPrivate} from '../../../settings/chromeos/fake_quick_unlock_private.js';

diff --git a/chrome/test/data/webui/cr_components/chromeos/multidevice_setup/setup_succeeded_page_test.js b/chrome/test/data/webui/cr_components/chromeos/multidevice_setup/setup_succeeded_page_test.js
@@ -8,9 +8,9 @@
  */
 
 import 'chrome://multidevice-setup/strings.m.js';
-import 'chrome://resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.m.js';
+import 'chrome://resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.js';
 
-import {BrowserProxyImpl} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.m.js';
+import {BrowserProxyImpl} from 'chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.js';
 
 import {TestBrowserProxy} from '../../../test_browser_proxy.js';
 

diff --git a/chrome/test/data/webui/cr_components/chromeos/multidevice_setup/start_setup_page_test.js b/chrome/test/data/webui/cr_components/chromeos/multidevice_setup/start_setup_page_test.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'chrome://multidevice-setup/strings.m.js';
-import 'chrome://resources/cr_components/chromeos/multidevice_setup/start_setup_page.m.js';
+import 'chrome://resources/cr_components/chromeos/multidevice_setup/start_setup_page.js';
 
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 

diff --git a/ui/webui/resources/cr_components/BUILD.gn b/ui/webui/resources/cr_components/BUILD.gn
@@ -93,6 +93,11 @@ preprocess_if_expr("preprocess_src") {
     "chromeos/bluetooth/bluetooth_types.js",
     "chromeos/bluetooth/bluetooth_metrics_utils.js",
     "chromeos/bluetooth/cros_bluetooth_config.js",
+    "chromeos/multidevice_setup/mojo_api.js",
+    "chromeos/multidevice_setup/fake_mojo_service.js",
+    "chromeos/multidevice_setup/multidevice_setup_browser_proxy.js",
+    "chromeos/multidevice_setup/multidevice_setup_delegate.js",
+    "chromeos/multidevice_setup/ui_page_container_behavior.js",
     "chromeos/network_health/mojo_interface_provider.js",
     "chromeos/network_health/network_diagnostics_types.js",
     "chromeos/quick_unlock/lock_screen_constants.js",
@@ -143,19 +148,14 @@ if (is_chromeos_ash) {
       "chromeos/cellular_setup/setup_loading_page.m.js",
       "chromeos/cellular_setup/subflow_behavior.m.js",
       "chromeos/cellular_setup/webview_post_util.m.js",
-      "chromeos/multidevice_setup/mojo_api.m.js",
-      "chromeos/multidevice_setup/fake_mojo_service.m.js",
-      "chromeos/multidevice_setup/button_bar.m.js",
-      "chromeos/multidevice_setup/multidevice_setup.m.js",
-      "chromeos/multidevice_setup/multidevice_setup_browser_proxy.m.js",
-      "chromeos/multidevice_setup/multidevice_setup_delegate.m.js",
-      "chromeos/multidevice_setup/password_page.m.js",
-      "chromeos/multidevice_setup/setup_succeeded_page.m.js",
-      "chromeos/multidevice_setup/start_setup_page.m.js",
-      "chromeos/multidevice_setup/ui_page_container_behavior.m.js",
-      "chromeos/multidevice_setup/multidevice_setup_shared_css.m.js",
-      "chromeos/multidevice_setup/ui_page.m.js",
-      "chromeos/multidevice_setup/icons.m.js",
+      "chromeos/multidevice_setup/button_bar.js",
+      "chromeos/multidevice_setup/multidevice_setup.js",
+      "chromeos/multidevice_setup/password_page.js",
+      "chromeos/multidevice_setup/setup_succeeded_page.js",
+      "chromeos/multidevice_setup/start_setup_page.js",
+      "chromeos/multidevice_setup/multidevice_setup_shared_css.js",
+      "chromeos/multidevice_setup/ui_page.js",
+      "chromeos/multidevice_setup/icons.js",
       "chromeos/network_health/network_health_container.js",
       "chromeos/network_health/network_health_summary.js",
       "chromeos/network_health/network_diagnostics.js",

diff --git a/ui/webui/resources/cr_components/chromeos/BUILD.gn b/ui/webui/resources/cr_components/chromeos/BUILD.gn
@@ -23,7 +23,7 @@ group("polymer3_elements") {
   public_deps = [
     "bluetooth:polymer3_elements",
     "cellular_setup:polymer3_elements",
-    "multidevice_setup:polymer3_elements",
+    "multidevice_setup:web_components",
     "network:polymer3_elements",
     "network_health:web_components",
     "quick_unlock:web_components",