SplitSettings cleanup: Move multidevice page files to chromeos/

Move multidevice page files that are unused by browser settings to
chromeos/.

Note: not moving browser proxy and constants, since these are used by
site settings.

Bug: 990132
Change-Id: I9864217b0a90eb7e2fb35a9a5a358841a555b650
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1979513
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727248}

chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn

+# Copyright 2018 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 = [
+    ":multidevice_feature_behavior",
+    ":multidevice_feature_item",
+    ":multidevice_feature_toggle",
+    ":multidevice_page",
+    ":multidevice_smartlock_subpage",
+    ":multidevice_subpage",
+    ":multidevice_tether_item",
+  ]
+}
+
+js_library("multidevice_feature_behavior") {
+  deps = [
+    "../../multidevice_page:multidevice_constants",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+js_library("multidevice_feature_item") {
+  deps = [
+    ":multidevice_feature_behavior",
+    "../..:route",
+    "../..:route_origin_behavior",
+    "../../multidevice_page:multidevice_constants",
+    "../localized_link:localized_link",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("multidevice_feature_toggle") {
+  deps = [
+    ":multidevice_feature_behavior",
+    "../../multidevice_page:multidevice_constants",
+  ]
+}
+
+js_library("multidevice_page") {
+  deps = [
+    ":multidevice_feature_behavior",
+    "../..:route",
+    "../../controls:password_prompt_dialog",
+    "../../multidevice_page:multidevice_browser_proxy",
+    "../../multidevice_page:multidevice_constants",
+    "../localized_link:localized_link",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+}
+
+js_library("multidevice_radio_button") {
+  deps = [
+    "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
+    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button_behavior",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator",
+  ]
+}
+
+js_library("multidevice_smartlock_subpage") {
+  deps = [
+    ":multidevice_feature_behavior",
+    "../../multidevice_page:multidevice_constants",
+    "../../prefs:prefs_behavior",
+    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("multidevice_subpage") {
+  deps = [
+    ":multidevice_feature_behavior",
+    "../..:route",
+    "../../multidevice_page:multidevice_constants",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
+  ]
+  externs_list = [ "$externs_path/networking_private.js" ]
+  extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
+}
+
+js_library("multidevice_tether_item") {
+  deps = [
+    ":multidevice_feature_behavior",
+    "../..:route",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
+  ]
+  externs_list = [ "$externs_path/networking_private.js" ]
+  extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
+}

chrome/browser/resources/settings/chromeos/multidevice_page/OWNERS

+file://chromeos/components/multidevice/OWNERS
+
+# COMPONENT: OS>Systems>Multidevice

chrome/browser/resources/settings/multidevice_page/multidevice_feature_behavior.html → chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_behavior.html

 <link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <!-- Anyone using this behavior might be using the referenced icons. -->
-<link rel="import" href="../chromeos/os_icons.html">
-<link rel="import" href="../i18n_setup.html">
-<link rel="import" href="multidevice_constants.html">
+<link rel="import" href="../os_icons.html">
+<link rel="import" href="../../i18n_setup.html">
+<link rel="import" href="../../multidevice_page/multidevice_constants.html">
 <script src="multidevice_feature_behavior.js"></script>

chrome/browser/resources/settings/multidevice_page/multidevice_feature_item.html → chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_item.html

@@ -4,12 +4,12 @@
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
 <link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="../chromeos/localized_link/localized_link.html">
-<link rel="import" href="../icons.html">
-<link rel="import" href="../route.html">
-<link rel="import" href="../route_origin_behavior.html">
-<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="multidevice_constants.html">
+<link rel="import" href="../../icons.html">
+<link rel="import" href="../../route.html">
+<link rel="import" href="../../route_origin_behavior.html">
+<link rel="import" href="../../settings_shared_css.html">
+<link rel="import" href="../../multidevice_page/multidevice_constants.html">
+<link rel="import" href="../localized_link/localized_link.html">
 <link rel="import" href="multidevice_feature_behavior.html">
 <link rel="import" href="multidevice_feature_toggle.html">
 
@@ -70,9 +70,9 @@
       </template>
       <div class="margin-matches-padding">
         <slot name="feature-controller">
-          <!-- This settings-multidevice-feature-toggle is the default controller.
-          If an element with slot="feature-controller" is attached, it will
-          replace this one. -->
+          <!-- This settings-multidevice-feature-toggle is the default
+          controller. If an element with slot="feature-controller" is attached,
+          it will replace this one. -->
           <settings-multidevice-feature-toggle
               feature="[[feature]]"
               page-content-data="[[pageContentData]]">

chrome/browser/resources/settings/multidevice_page/multidevice_feature_toggle.html → chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_toggle.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
-<link rel="import" href="multidevice_browser_proxy.html">
-<link rel="import" href="multidevice_constants.html">
+<link rel="import" href="../../multidevice_page/multidevice_browser_proxy.html">
+<link rel="import" href="../../multidevice_page/multidevice_constants.html">
 <link rel="import" href="multidevice_feature_behavior.html">
 
 <dom-module id="settings-multidevice-feature-toggle">

chrome/browser/resources/settings/multidevice_page/multidevice_page.html → chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_page.html

@@ -7,16 +7,16 @@
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="../chromeos/localized_link/localized_link.html">
-<link rel="import" href="../i18n_setup.html">
-<link rel="import" href="../icons.html">
-<link rel="import" href="../route.html">
-<link rel="import" href="../controls/password_prompt_dialog.html">
-<link rel="import" href="../settings_page/settings_animated_pages.html">
-<link rel="import" href="../settings_page/settings_subpage.html">
-<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="multidevice_browser_proxy.html">
-<link rel="import" href="multidevice_constants.html">
+<link rel="import" href="../../i18n_setup.html">
+<link rel="import" href="../../icons.html">
+<link rel="import" href="../../route.html">
+<link rel="import" href="../../controls/password_prompt_dialog.html">
+<link rel="import" href="../../settings_page/settings_animated_pages.html">
+<link rel="import" href="../../settings_page/settings_subpage.html">
+<link rel="import" href="../../settings_shared_css.html">
+<link rel="import" href="../../multidevice_page/multidevice_browser_proxy.html">
+<link rel="import" href="../../multidevice_page/multidevice_constants.html">
+<link rel="import" href="../localized_link/localized_link.html">
 <link rel="import" href="multidevice_feature_behavior.html">
 <link rel="import" href="multidevice_feature_toggle.html">
 <link rel="import" href="multidevice_smartlock_subpage.html">

chrome/browser/resources/settings/multidevice_page/multidevice_radio_button.html → chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.html

@@ -4,7 +4,7 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_radio_button_style_css.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicator.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
-<link rel="import" href="../settings_shared_css.html">
+<link rel="import" href="../../settings_shared_css.html">
 
 <!-- TODO(jhawkins): This is copy/pasted from controlled_radio_button. Figure
   out how to refactor such that a common UI/behavior may be shared. The only

chrome/browser/resources/settings/multidevice_page/multidevice_smartlock_subpage.html → chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_subpage.html

@@ -3,13 +3,13 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_radio_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_radio_group/cr_radio_group.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
-<link rel="import" href="multidevice_constants.html">
-<link rel="import" href="multidevice_browser_proxy.html">
+<link rel="import" href="../../multidevice_page/multidevice_constants.html">
+<link rel="import" href="../../multidevice_page/multidevice_browser_proxy.html">
 <link rel="import" href="multidevice_feature_behavior.html">
 <link rel="import" href="multidevice_feature_toggle.html">
 <link rel="import" href="multidevice_radio_button.html">
-<link rel="import" href="../i18n_setup.html">
-<link rel="import" href="../settings_shared_css.html">
+<link rel="import" href="../../i18n_setup.html">
+<link rel="import" href="../../settings_shared_css.html">
 
 <dom-module id="settings-multidevice-smartlock-subpage">
   <template>

chrome/browser/resources/settings/multidevice_page/multidevice_subpage.html → chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.html

@@ -6,11 +6,11 @@
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
 <link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="../i18n_setup.html">
-<link rel="import" href="../route.html">
-<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="../settings_vars_css.html">
-<link rel="import" href="multidevice_constants.html">
+<link rel="import" href="../../i18n_setup.html">
+<link rel="import" href="../../route.html">
+<link rel="import" href="../../settings_shared_css.html">
+<link rel="import" href="../../settings_vars_css.html">
+<link rel="import" href="../../multidevice_page/multidevice_constants.html">
 <link rel="import" href="multidevice_feature_behavior.html">
 <link rel="import" href="multidevice_feature_item.html">
 <link rel="import" href="multidevice_feature_toggle.html">

chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.html → chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.html

@@ -3,10 +3,10 @@
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_icon.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.html">
-<link rel="import" href="../i18n_setup.html">
-<link rel="import" href="../route.html">
-<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="../settings_vars_css.html">
+<link rel="import" href="../../i18n_setup.html">
+<link rel="import" href="../../route.html">
+<link rel="import" href="../../settings_shared_css.html">
+<link rel="import" href="../../settings_vars_css.html">
 <link rel="import" href="multidevice_feature_behavior.html">
 <link rel="import" href="multidevice_feature_item.html">
 

chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_page.html

@@ -20,7 +20,7 @@
 <link rel="import" href="../../prefs/prefs_behavior.html">
 <link rel="import" href="../device_page/device_page.html">
 <link rel="import" href="../internet_page/internet_page.html">
-<link rel="import" href="../../multidevice_page/multidevice_page.html">
+<link rel="import" href="../multidevice_page/multidevice_page.html">
 
 <dom-module id="os-settings-page">
   <template>

chrome/browser/resources/settings/multidevice_page/BUILD.gn

@@ -12,17 +12,6 @@ js_type_check("closure_compile") {
     ":multidevice_browser_proxy",
     ":multidevice_constants",
   ]
-  if (is_chromeos) {
-    deps += [
-      ":multidevice_feature_behavior",
-      ":multidevice_feature_item",
-      ":multidevice_feature_toggle",
-      ":multidevice_page",
-      ":multidevice_smartlock_subpage",
-      ":multidevice_subpage",
-      ":multidevice_tether_item",
-    ]
-  }
 }
 
 js_library("multidevice_browser_proxy") {
@@ -37,84 +26,3 @@ js_library("multidevice_constants") {
     "//ui/webui/resources/js:cr",
   ]
 }
-
-if (is_chromeos) {
-  js_library("multidevice_feature_behavior") {
-    deps = [
-      ":multidevice_constants",
-      "//ui/webui/resources/js:cr",
-      "//ui/webui/resources/js:i18n_behavior",
-    ]
-  }
-
-  js_library("multidevice_feature_item") {
-    deps = [
-      ":multidevice_constants",
-      ":multidevice_feature_behavior",
-      "..:route",
-      "..:route_origin_behavior",
-      "../chromeos/localized_link:localized_link",
-      "//ui/webui/resources/js:cr",
-    ]
-  }
-
-  js_library("multidevice_feature_toggle") {
-    deps = [
-      ":multidevice_constants",
-      ":multidevice_feature_behavior",
-    ]
-  }
-
-  js_library("multidevice_page") {
-    deps = [
-      ":multidevice_browser_proxy",
-      ":multidevice_constants",
-      ":multidevice_feature_behavior",
-      "..:route",
-      "../chromeos/localized_link:localized_link",
-      "../controls:password_prompt_dialog",
-      "//ui/webui/resources/js:cr",
-      "//ui/webui/resources/js:web_ui_listener_behavior",
-    ]
-  }
-
-  js_library("multidevice_radio_button") {
-    deps = [
-      "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
-      "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button_behavior",
-      "//ui/webui/resources/cr_elements/policy:cr_policy_indicator",
-    ]
-  }
-
-  js_library("multidevice_smartlock_subpage") {
-    deps = [
-      ":multidevice_constants",
-      ":multidevice_feature_behavior",
-      "../prefs:prefs_behavior",
-      "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button",
-      "//ui/webui/resources/js:cr",
-    ]
-  }
-
-  js_library("multidevice_subpage") {
-    deps = [
-      ":multidevice_constants",
-      ":multidevice_feature_behavior",
-      "..:route",
-      "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
-    ]
-    externs_list = [ "$externs_path/networking_private.js" ]
-    extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
-  }
-
-  js_library("multidevice_tether_item") {
-    deps = [
-      ":multidevice_feature_behavior",
-      "..:route",
-      "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
-      "//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
-    ]
-    externs_list = [ "$externs_path/networking_private.js" ]
-    extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
-  }
-}

chrome/browser/resources/settings/os_settings_resources.grd

@@ -1141,52 +1141,52 @@
                  file="multidevice_page/multidevice_constants.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_BEHAVIOR_HTML"
-                 file="multidevice_page/multidevice_feature_behavior.html"
+                 file="chromeos/multidevice_page/multidevice_feature_behavior.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_BEHAVIOR_JS"
-                 file="multidevice_page/multidevice_feature_behavior.js"
+                 file="chromeos/multidevice_page/multidevice_feature_behavior.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_ITEM_HTML"
-                 file="multidevice_page/multidevice_feature_item.html"
+                 file="chromeos/multidevice_page/multidevice_feature_item.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_ITEM_JS"
-                 file="multidevice_page/multidevice_feature_item.js"
+                 file="chromeos/multidevice_page/multidevice_feature_item.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_TOGGLE_HTML"
-                 file="multidevice_page/multidevice_feature_toggle.html"
+                 file="chromeos/multidevice_page/multidevice_feature_toggle.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_TOGGLE_JS"
-                 file="multidevice_page/multidevice_feature_toggle.js"
+                 file="chromeos/multidevice_page/multidevice_feature_toggle.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_PAGE_HTML"
-                 file="multidevice_page/multidevice_page.html"
+                 file="chromeos/multidevice_page/multidevice_page.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_PAGE_JS"
-                 file="multidevice_page/multidevice_page.js"
+                 file="chromeos/multidevice_page/multidevice_page.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_RADIO_BUTTON_HTML"
-                 file="multidevice_page/multidevice_radio_button.html"
+                 file="chromeos/multidevice_page/multidevice_radio_button.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_RADIO_BUTTON_JS"
-                 file="multidevice_page/multidevice_radio_button.js"
+                 file="chromeos/multidevice_page/multidevice_radio_button.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_SMARTLOCK_SUBPAGE_HTML"
-                 file="multidevice_page/multidevice_smartlock_subpage.html"
+                 file="chromeos/multidevice_page/multidevice_smartlock_subpage.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_SMARTLOCK_SUBPAGE_JS"
-                 file="multidevice_page/multidevice_smartlock_subpage.js"
+                 file="chromeos/multidevice_page/multidevice_smartlock_subpage.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_SUBPAGE_HTML"
-                 file="multidevice_page/multidevice_subpage.html"
+                 file="chromeos/multidevice_page/multidevice_subpage.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_SUBPAGE_JS"
-                 file="multidevice_page/multidevice_subpage.js"
+                 file="chromeos/multidevice_page/multidevice_subpage.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_TETHER_ITEM_HTML"
-                 file="multidevice_page/multidevice_tether_item.html"
+                 file="chromeos/multidevice_page/multidevice_tether_item.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_TETHER_ITEM_JS"
-                 file="multidevice_page/multidevice_tether_item.js"
+                 file="chromeos/multidevice_page/multidevice_tether_item.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_PROXY_SECTION_HTML"
                  file="chromeos/internet_page/network_proxy_section.html"

chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js

@@ -602,7 +602,7 @@ var OSSettingsMultideviceFeatureItemTest = class extends OSSettingsBrowserTest {
   /** @override */
   get browsePreload() {
     return super.browsePreload +
-        'multidevice_page/multidevice_feature_item.html';
+        'chromeos/multidevice_page/multidevice_feature_item.html';
   }
 
   /** @override */
@@ -624,7 +624,7 @@ var OSSettingsMultideviceFeatureToggleTest =
   /** @override */
   get browsePreload() {
     return super.browsePreload +
-        'multidevice_page/multidevice_feature_toggle.html';
+        'chromeos/multidevice_page/multidevice_feature_toggle.html';
   }
 
   /** @override */
@@ -644,7 +644,8 @@ TEST_F('OSSettingsMultideviceFeatureToggleTest', 'AllJsTests', () => {
 var OSSettingsMultidevicePageTest = class extends OSSettingsBrowserTest {
   /** @override */
   get browsePreload() {
-    return super.browsePreload + 'multidevice_page/multidevice_page.html';
+    return super.browsePreload +
+        'chromeos/multidevice_page/multidevice_page.html';
   }
 
   /** @override */
@@ -668,7 +669,7 @@ var OSSettingsMultideviceSmartLockSubpageTest =
   /** @override */
   get browsePreload() {
     return super.browsePreload +
-        'multidevice_page/multidevice_smartlock_subpage.html';
+        'chromeos/multidevice_page/multidevice_smartlock_subpage.html';
   }
 
   /** @override */
@@ -691,7 +692,8 @@ TEST_F('OSSettingsMultideviceSmartLockSubpageTest', 'AllJsTests', () => {
 var OSSettingsMultideviceSubpageTest = class extends OSSettingsBrowserTest {
   /** @override */
   get browsePreload() {
-    return super.browsePreload + 'multidevice_page/multidevice_subpage.html';
+    return super.browsePreload +
+        'chromeos/multidevice_page/multidevice_subpage.html';
   }
 
   /** @override */