SplitSettings: Remove RouteOriginBehavior from browser settings

Bug: 986596
Change-Id: I473937026ba6d3d14e7de973c325033d7c8484a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1990566
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729647}

chrome/browser/resources/settings/BUILD.gn

@@ -120,7 +120,6 @@ js_type_check("settings_resources") {
     ":open_window_proxy",
     ":page_visibility",
     ":route",
-    ":route_origin_behavior",
     ":search_settings",
   ]
 }
@@ -153,13 +152,6 @@ js_library("open_window_proxy") {
   ]
 }
 
-js_library("route_origin_behavior") {
-  deps = [
-    ":route",
-    "//ui/webui/resources/js:cr",
-  ]
-}
-
 js_library("route") {
   deps = [
     ":page_visibility",

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

@@ -73,6 +73,7 @@ if (optimize_webui) {
 group("closure_compile") {
   deps = [
     ":os_page_visibility",
+    ":route_origin_behavior",
     "bluetooth_page:closure_compile",
     "crostini_page:closure_compile",
     "date_time_page:closure_compile",
@@ -104,3 +105,10 @@ js_library("os_page_visibility") {
     "//ui/webui/resources/js:load_time_data",
   ]
 }
+
+js_library("route_origin_behavior") {
+  deps = [
+    "..:route",
+    "//ui/webui/resources/js:cr",
+  ]
+}

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

@@ -70,8 +70,8 @@ js_library("crostini_shared_usb_devices") {
 js_library("crostini_subpage") {
   deps = [
     ":crostini_browser_proxy",
+    "..:route_origin_behavior",
     "../..:route",
-    "../..:route_origin_behavior",
     "../../prefs:prefs_behavior",
   ]
 }

chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.html

@@ -7,7 +7,7 @@
 <link rel="import" href="../../i18n_setup.html">
 <link rel="import" href="../../prefs/prefs_behavior.html">
 <link rel="import" href="../../route.html">
-<link rel="import" href="../../route_origin_behavior.html">
+<link rel="import" href="../route_origin_behavior.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="../../settings_shared_css.html">
 

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

@@ -141,8 +141,8 @@ js_library("power") {
 
 js_library("storage") {
   deps = [
+    "..:route_origin_behavior",
     "../..:route",
-    "../..:route_origin_behavior",
     "../localized_link:localized_link",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:load_time_data",

chrome/browser/resources/settings/chromeos/device_page/storage.html

@@ -9,9 +9,9 @@
 <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="storage_external.html">
+<link rel="import" href="../route_origin_behavior.html">
 <link rel="import" href="../../prefs/prefs.html">
 <link rel="import" href="../../route.html">
-<link rel="import" href="../../route_origin_behavior.html">
 <link rel="import" href="../../settings_shared_css.html">
 
 <dom-module id="settings-storage">

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

@@ -90,8 +90,8 @@ js_library("internet_known_networks_page") {
 js_library("internet_subpage") {
   deps = [
     ":internet_page_browser_proxy",
+    "..:route_origin_behavior",
     "../..:route",
-    "../..:route_origin_behavior",
     "../localized_link:localized_link",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo",

chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.html

@@ -16,7 +16,7 @@
 <link rel="import" href="../../chromeos/os_settings_icons_css.html">
 <link rel="import" href="../../i18n_setup.html">
 <link rel="import" href="../../route.html">
-<link rel="import" href="../../route_origin_behavior.html">
+<link rel="import" href="../route_origin_behavior.html">
 <link rel="import" href="../../settings_shared_css.html">
 
 <dom-module id="settings-internet-subpage">

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

@@ -41,8 +41,8 @@ js_library("multidevice_feature_item") {
   deps = [
     ":multidevice_feature_behavior",
     ":multidevice_page:multidevice_constants",
+    "..:route_origin_behavior",
     "../..:route",
-    "../..:route_origin_behavior",
     "../localized_link:localized_link",
     "//ui/webui/resources/js:cr",
   ]

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

@@ -6,9 +6,9 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.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="../localized_link/localized_link.html">
+<link rel="import" href="../route_origin_behavior.html">
 <link rel="import" href="multidevice_constants.html">
 <link rel="import" href="multidevice_feature_behavior.html">
 <link rel="import" href="multidevice_feature_toggle.html">

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

@@ -27,8 +27,8 @@ js_library("os_a11y_page") {
 
 js_library("manage_a11y_page") {
   deps = [
+    "..:route_origin_behavior",
     "../..:route",
-    "../..:route_origin_behavior",
     "../device_page:device_page_browser_proxy",
     "//ui/webui/resources/js:load_time_data",
     "//ui/webui/resources/js:web_ui_listener_behavior",

chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html

@@ -9,10 +9,10 @@
 <link rel="import" href="../../controls/settings_toggle_button.html">
 <link rel="import" href="../../i18n_setup.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="../device_page/device_page_browser_proxy.html">
 <link rel="import" href="../localized_link/localized_link.html">
+<link rel="import" href="../route_origin_behavior.html">
 
 <dom-module id="settings-manage-a11y-page">
   <template>

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

 <link rel="import" href="chrome://resources/html/assert.html">
-<link rel="import" href="route.html">
+<link rel="import" href="../route.html">
 <script src="route_origin_behavior.js"></script>

chrome/browser/resources/settings/os_settings_resources.grd

@@ -762,11 +762,11 @@
                  file="route.js"
                  type="chrome_html"
                  preprocess="true" />
-      <structure name="IDR_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_HTML"
-                 file="route_origin_behavior.html"
+      <structure name="IDR_OS_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_HTML"
+                 file="chromeos/route_origin_behavior.html"
                  type="chrome_html" />
-      <structure name="IDR_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_JS"
-                 file="route_origin_behavior.js"
+      <structure name="IDR_OS_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_JS"
+                 file="chromeos/route_origin_behavior.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_JS"
                  file="search_engines_page/search_engines_browser_proxy.js"

chrome/browser/resources/settings/settings_resources.grd

@@ -865,14 +865,6 @@
                  file="route.js"
                  type="chrome_html"
                  preprocess="true" />
-      <if expr="chromeos">
-        <structure name="IDR_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_HTML"
-                   file="route_origin_behavior.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_JS"
-                   file="route_origin_behavior.js"
-                   type="chrome_html" />
-      </if>
       <structure name="IDR_SETTINGS_SITE_FAVICON_HTML"
                  file="site_favicon.html"
                  type="chrome_html" />