chromeos: SplitSettings cleanup for android-apps-subpage

This subpage only exists in OS settings under apps, so move it into
//chrome/browser/resources/settings/chromeos/os_apps_page/

Browser settings still needs to use AndroidAppsBrowserProxy for the
protocol handlers page.

Fixed: 1034722
Change-Id: Ia67bbb61ac847f0124ee5170c5c0ec2facae0b33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974532
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726264}

chrome/browser/resources/settings/BUILD.gn

@@ -106,7 +106,6 @@ group("closure_compile") {
 
   if (is_chromeos) {
     deps += [
-      "android_apps_page:closure_compile",
       "chromeos:closure_compile",
       "multidevice_page:closure_compile",
       "parental_controls_page:closure_compile",

chrome/browser/resources/settings/android_apps_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 = [
-    ":android_apps_browser_proxy",
-    ":android_apps_subpage",
-  ]
-}
-
-js_library("android_apps_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("android_apps_subpage") {
-  deps = [
-    ":android_apps_browser_proxy",
-    "..:route",
-    "../prefs:prefs_behavior",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}

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

@@ -6,15 +6,34 @@ import("//third_party/closure_compiler/compile_js.gni")
 
 js_type_check("closure_compile") {
   deps = [
+    ":android_apps_browser_proxy",
+    ":android_apps_subpage",
     ":os_apps_page",
   ]
 }
 
+js_library("android_apps_browser_proxy") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("android_apps_subpage") {
+  deps = [
+    ":android_apps_browser_proxy",
+    "../..:route",
+    "../../prefs:prefs_behavior",
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:i18n_behavior",
+    "//ui/webui/resources/js/cr/ui:focus_without_ink",
+  ]
+}
+
 js_library("os_apps_page") {
   deps = [
+    ":android_apps_browser_proxy",
+    ":android_apps_subpage",
     "../../:route",
-    "../../android_apps_page:android_apps_browser_proxy",
-    "../../android_apps_page:android_apps_subpage",
     "../../prefs:prefs_behavior",
     "../../settings_page:settings_animated_pages",
     "../localized_link:localized_link",

chrome/browser/resources/settings/android_apps_page/android_apps_subpage.html → chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_subpage.html

@@ -7,9 +7,9 @@
 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="android_apps_browser_proxy.html">
-<link rel="import" href="../i18n_setup.html">
-<link rel="import" href="../prefs/prefs_behavior.html">
-<link rel="import" href="../settings_shared_css.html">
+<link rel="import" href="../../i18n_setup.html">
+<link rel="import" href="../../prefs/prefs_behavior.html">
+<link rel="import" href="../../settings_shared_css.html">
 
 <dom-module id="settings-android-apps-subpage">
   <template>

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

@@ -5,8 +5,6 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="../../android_apps_page/android_apps_browser_proxy.html">
-<link rel="import" href="../../android_apps_page/android_apps_subpage.html">
 <link rel="import" href="../../i18n_setup.html">
 <link rel="import" href="../../prefs/prefs_behavior.html">
 <link rel="import" href="../../route.html">
@@ -15,6 +13,8 @@
 <link rel="import" href="../../settings_shared_css.html">
 <link rel="import" href="../../settings_shared_css.html">
 <link rel="import" href="../localized_link/localized_link.html">
+<link rel="import" href="android_apps_browser_proxy.html">
+<link rel="import" href="android_apps_subpage.html">
 <link rel="import" href="app_management_page/app_management_page.html">
 <link rel="import" href="app_management_page/app_detail_view.html">
 <link rel="import" href="app_management_page/uninstall_button.html">

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

@@ -15,10 +15,9 @@ js_library("os_settings_page") {
     "../..:page_visibility",
     "../..:route",
     "../..:search_settings",
-    "../../android_apps_page:android_apps_browser_proxy",
-    "../../chrome_cleanup_page:chrome_cleanup_proxy",
     "../../prefs:prefs_behavior",
     "../../settings_page:main_page_behavior",
+    "../os_apps_page:android_apps_browser_proxy",
     "//ui/webui/resources/js:load_time_data",
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]

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

@@ -5,6 +5,7 @@
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="../os_a11y_page/os_a11y_page.html">
+<link rel="import" href="../os_apps_page/android_apps_browser_proxy.html">
 <link rel="import" href="../os_apps_page/os_apps_page.html">
 <link rel="import" href="../os_people_page/os_people_page.html">
 <link rel="import" href="../os_search_page/os_search_page.html">
@@ -13,7 +14,6 @@
 <link rel="import" href="../../settings_page/main_page_behavior.html">
 <link rel="import" href="../../settings_page/settings_section.html">
 <link rel="import" href="../../settings_page_css.html">
-<link rel="import" href="../../android_apps_page/android_apps_browser_proxy.html">
 <link rel="import" href="../bluetooth_page/bluetooth_page.html">
 <link rel="import" href="../crostini_page/crostini_page.html">
 <link rel="import" href="../plugin_vm_page/plugin_vm_page.html">

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

@@ -139,12 +139,9 @@ Polymer({
     this.allowCrostini_ = loadTimeData.valueExists('allowCrostini') &&
         loadTimeData.getBoolean('allowCrostini');
 
-    if (settings.AndroidAppsBrowserProxyImpl) {
-      this.addWebUIListener(
-          'android-apps-info-update', this.androidAppsInfoUpdate_.bind(this));
-      settings.AndroidAppsBrowserProxyImpl.getInstance()
-          .requestAndroidAppsInfo();
-    }
+    this.addWebUIListener(
+        'android-apps-info-update', this.androidAppsInfoUpdate_.bind(this));
+    settings.AndroidAppsBrowserProxyImpl.getInstance().requestAndroidAppsInfo();
   },
 
   /**

chrome/browser/resources/settings/os_settings_resources.grd

@@ -974,18 +974,18 @@
                  file="chromeos/lazy_load.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ANDROID_APPS_SUBPAGE_HTML"
-                 file="android_apps_page/android_apps_subpage.html"
+                 file="chromeos/os_apps_page/android_apps_subpage.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ANDROID_APPS_SUBPAGE_JS"
-                 file="android_apps_page/android_apps_subpage.js"
+                 file="chromeos/os_apps_page/android_apps_subpage.js"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ANDROID_APPS_BROWSER_PROXY_JS"
-                 file="android_apps_page/android_apps_browser_proxy.js"
+                 file="chromeos/os_apps_page/android_apps_browser_proxy.js"
                  type="chrome_html"
                  preprocess="true"
                  allowexternalscript="true" />
       <structure name="IDR_OS_SETTINGS_ANDROID_APPS_BROWSER_PROXY_HTML"
-                 file="android_apps_page/android_apps_browser_proxy.html"
+                 file="chromeos/os_apps_page/android_apps_browser_proxy.html"
                  type="chrome_html"
                  preprocess="true"
                  allowexternalscript="true" />

chrome/browser/resources/settings/settings_resources.grd

@@ -1231,19 +1231,13 @@
                  file="site_settings/zoom_levels.js"
                  type="chrome_html" />
       <if expr="chromeos">
-        <structure name="IDR_SETTINGS_ANDROID_APPS_SUBPAGE_HTML"
-                   file="android_apps_page/android_apps_subpage.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_ANDROID_APPS_SUBPAGE_JS"
-                   file="android_apps_page/android_apps_subpage.js"
-                   type="chrome_html" />
         <structure name="IDR_SETTINGS_ANDROID_APPS_BROWSER_PROXY_JS"
-                   file="android_apps_page/android_apps_browser_proxy.js"
+                   file="chromeos/os_apps_page/android_apps_browser_proxy.js"
                    type="chrome_html"
                    preprocess="true"
                    allowexternalscript="true" />
         <structure name="IDR_SETTINGS_ANDROID_APPS_BROWSER_PROXY_HTML"
-                   file="android_apps_page/android_apps_browser_proxy.html"
+                   file="chromeos/os_apps_page/android_apps_browser_proxy.html"
                    type="chrome_html"
                    preprocess="true"
                    allowexternalscript="true" />

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

@@ -131,7 +131,9 @@ js_library("cookie_info") {
 js_library("protocol_handlers") {
   deps = [
     ":site_settings_behavior",
-    "../android_apps_page:android_apps_browser_proxy",
+
+    # Must be included on all platforms to satisfy closure compiler.
+    "../chromeos/os_apps_page:android_apps_browser_proxy",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]

chrome/browser/resources/settings/site_settings/protocol_handlers.html

@@ -13,7 +13,7 @@
 <link rel="import" href="site_settings_prefs_browser_proxy.html">
 
 <if expr="chromeos">
-<link rel="import" href="../android_apps_page/android_apps_browser_proxy.html">
+<link rel="import" href="../chromeos/os_apps_page/android_apps_browser_proxy.html">
 </if>
 
 <dom-module id="protocol-handlers">