[Lacros] Browser settings should not include "default browser" section

Fixed: 1128971
Change-Id: Ifcf996108f169337e379f8bbcebc7bac87080539
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2597144
Commit-Queue: Darin Fisher <darin@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841122}

chrome/browser/resources/settings/BUILD.gn

@@ -146,8 +146,10 @@ preprocess_if_expr("preprocess") {
       "site_settings/android_info_browser_proxy.js",
     ]
   } else {
+    if (!is_chromeos_lacros) {
+      in_files += [ "default_browser_page/default_browser_browser_proxy.js" ]
+    }
     in_files += [
-      "default_browser_page/default_browser_browser_proxy.js",
       "people_page/import_data_browser_proxy.js",
       "people_page/manage_profile_browser_proxy.js",
       "system_page/system_page_browser_proxy.js",
@@ -326,8 +328,10 @@ preprocess_if_expr("preprocess_generated") {
   if (is_chromeos_ash) {
     in_files += [ "people_page/account_manager_browser_proxy.m.js" ]
   } else {
+    if (!is_chromeos_lacros) {
+      in_files += [ "default_browser_page/default_browser_page.js" ]
+    }
     in_files += [
-      "default_browser_page/default_browser_page.js",
       "people_page/import_data_dialog.js",
       "people_page/manage_profile.js",
       "system_page/system_page.js",
@@ -462,10 +466,10 @@ group("closure_compile_module") {
     "site_settings_page:closure_compile_module",
   ]
   if (!is_chromeos_ash) {
-    deps += [
-      "default_browser_page:closure_compile_module",
-      "system_page:closure_compile_module",
-    ]
+    if (!is_chromeos_lacros) {
+      deps += [ "default_browser_page:closure_compile_module" ]
+    }
+    deps += [ "system_page:closure_compile_module" ]
   }
 
   if (is_win) {
@@ -673,10 +677,10 @@ group("polymer3_elements") {
   ]
 
   if (!is_chromeos_ash) {
-    public_deps += [
-      "default_browser_page:web_components",
-      "system_page:web_components",
-    ]
+    if (!is_chromeos_lacros) {
+      public_deps += [ "default_browser_page:web_components" ]
+    }
+    public_deps += [ "system_page:web_components" ]
   }
 
   if (is_win) {

chrome/browser/resources/settings/basic_page/basic_page.html

@@ -122,7 +122,7 @@
             section="search">
           <settings-search-page prefs="{{prefs}}"></settings-search-page>
         </settings-section>
-<if expr="not chromeos">
+<if expr="not chromeos and not lacros">
         <template is="dom-if" if="[[showPage_(pageVisibility.defaultBrowser)]]"
             restamp>
           <settings-section page-title="$i18n{defaultBrowser}"

chrome/browser/resources/settings/basic_page/basic_page.js

@@ -26,7 +26,7 @@ import '../settings_page_css.m.js';
 import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js';
 // </if>
 
-// <if expr="not chromeos">
+// <if expr="not chromeos and not lacros">
 import '../default_browser_page/default_browser_page.js';
 // </if>
 

chrome/browser/resources/settings/route.js

@@ -146,10 +146,12 @@ function createBrowserSettingsRoutes() {
     r.SAFETY_CHECK = r.BASIC.createSection('/safetyCheck', 'safetyCheck');
   }
 
+  // <if expr="not chromeos and not lacros">
   if (visibility.defaultBrowser !== false) {
     r.DEFAULT_BROWSER =
         r.BASIC.createSection('/defaultBrowser', 'defaultBrowser');
   }
+  // </if>
 
   r.SEARCH_ENGINES = r.SEARCH.createChild('/searchEngines');
 

chrome/browser/resources/settings/settings.js

@@ -10,7 +10,7 @@ export {AppearanceBrowserProxy, AppearanceBrowserProxyImpl} from './appearance_p
 export {MultiStoreExceptionEntry} from './autofill_page/multi_store_exception_entry.js';
 export {MultiStorePasswordUiEntry} from './autofill_page/multi_store_password_ui_entry.js';
 export {PasswordManagerImpl, PasswordManagerProxy} from './autofill_page/password_manager_proxy.js';
-// <if expr="not chromeos">
+// <if expr="not chromeos and not lacros">
 export {DefaultBrowserBrowserProxyImpl} from './default_browser_page/default_browser_browser_proxy.js';
 // </if>
 export {ExtensionControlBrowserProxyImpl} from './extension_control_browser_proxy.m.js';

chrome/browser/resources/settings/settings_menu/settings_menu.html

@@ -131,7 +131,7 @@
             <iron-icon icon="cr:search"></iron-icon>
             $i18n{searchPageTitle}
           </a>
-    <if expr="not chromeos">
+    <if expr="not chromeos and not lacros">
           <a role="menuitem" id="defaultBrowser"
             href="/defaultBrowser"
             hidden="[[!pageVisibility.defaultBrowser]]">

chrome/test/data/webui/BUILD.gn

@@ -192,6 +192,7 @@ if (include_js_tests) {
 
     deps = [
       ":modulize",
+      "settings:preprocess",
       "//build:branding_buildflags",
       "//chrome/browser/ui",
       "//services/network/public/cpp",
@@ -232,6 +233,7 @@ if (include_js_tests) {
       "$root_gen_dir/chrome/test/data/webui/settings/pref_util_tests.m.js",
       "$root_gen_dir/chrome/test/data/webui/settings/prefs_test_cases.m.js",
       "$root_gen_dir/chrome/test/data/webui/settings/prefs_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/route_tests.js",
       "$root_gen_dir/chrome/test/data/webui/settings/settings_slider_tests.m.js",
       "$root_gen_dir/chrome/test/data/webui/settings/settings_textarea_tests.m.js",
       "$root_gen_dir/chrome/test/data/webui/settings/settings_toggle_button_tests.m.js",

chrome/test/data/webui/settings/BUILD.gn

@@ -5,9 +5,16 @@
 import("//build/config/chromeos/ui_mode.gni")
 import("//chrome/browser/resources/settings/settings.gni")
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../namespace_rewrites.gni")
 
+preprocess_if_expr("preprocess") {
+  in_folder = "./"
+  out_folder = "$target_gen_dir"
+  in_files = [ "route_tests.js" ]
+}
+
 group("modulize") {
   public_deps = [ ":modulize_local" ]
 

chrome/test/data/webui/settings/cr_settings_v3_browsertest.js

@@ -8,6 +8,7 @@
 GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
 
 GEN('#include "build/branding_buildflags.h"');
+GEN('#include "build/chromeos_buildflags.h"');
 GEN('#include "chrome/common/chrome_features.h"');
 GEN('#include "components/autofill/core/common/autofill_features.h"');
 GEN('#include "components/password_manager/core/common/password_manager_features.h"');
@@ -542,9 +543,13 @@ GEN('#if !defined(OS_MAC)');
 ].forEach(test => registerTest(...test));
 GEN('#endif  //!defined(OS_MAC)');
 
-GEN('#if !defined(OS_CHROMEOS)');
+GEN('#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS)');
 [['DefaultBrowser', 'default_browser_browsertest.js'],
- ['ImportDataDialog', 'import_data_dialog_test.js'],
+].forEach(test => registerTest(...test));
+GEN('#endif  // !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS)');
+
+GEN('#if !defined(OS_CHROMEOS)');
+[['ImportDataDialog', 'import_data_dialog_test.js'],
  ['PeoplePageManageProfile', 'people_page_manage_profile_test.js'],
  ['SystemPage', 'system_page_tests.js'],
 ].forEach(test => registerTest(...test));

chrome/test/data/webui/settings/route_tests.js

@@ -206,7 +206,9 @@ suite('route', function() {
     }
 
     assertFalse(routes.PRIVACY.isNavigableDialog);
+    // <if expr="not chromeos and not lacros">
     assertFalse(routes.DEFAULT_BROWSER.isNavigableDialog);
+    // </if>
   });
 
   test('pageVisibility affects route availability', function() {

chrome/test/data/webui/settings/settings_menu_test.js

@@ -5,7 +5,7 @@
 /** @fileoverview Runs tests for the settings menu. */
 
 // clang-format off
-import {isChromeOS} from 'chrome://resources/js/cr.m.js';
+import {isChromeOS, isLacros} from 'chrome://resources/js/cr.m.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 import {pageVisibility, Router, routes} from 'chrome://settings/settings.js';
 // clang-format on
@@ -139,7 +139,7 @@ suite('SettingsMenuReset', function() {
       assertEquals(expectedHidden, settingsMenu.$$('#reset').hidden);
       assertEquals(expectedHidden, settingsMenu.$$('#safetyCheck').hidden);
 
-      if (!isChromeOS) {
+      if (!isChromeOS && !isLacros) {
         assertEquals(expectedHidden, settingsMenu.$$('#defaultBrowser').hidden);
       }
     }