lacros: Browser settings should not include "system" section

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

chrome/browser/resources/settings/BUILD.gn

@@ -147,12 +147,14 @@ preprocess_if_expr("preprocess") {
     ]
   } 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",
+        "system_page/system_page_browser_proxy.js",
+      ]
     }
     in_files += [
       "people_page/import_data_browser_proxy.js",
       "people_page/manage_profile_browser_proxy.js",
-      "system_page/system_page_browser_proxy.js",
     ]
   }
 }
@@ -329,12 +331,14 @@ preprocess_if_expr("preprocess_generated") {
     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",
+        "system_page/system_page.js",
+      ]
     }
     in_files += [
       "people_page/import_data_dialog.js",
       "people_page/manage_profile.js",
-      "system_page/system_page.js",
     ]
   }
 }
@@ -465,11 +469,11 @@ group("closure_compile_module") {
     "site_settings:closure_compile_module",
     "site_settings_page:closure_compile_module",
   ]
-  if (!is_chromeos_ash) {
-    if (!is_chromeos_lacros) {
-      deps += [ "default_browser_page:closure_compile_module" ]
-    }
-    deps += [ "system_page:closure_compile_module" ]
+  if (!is_chromeos_ash && !is_chromeos_lacros) {
+    deps += [
+      "default_browser_page:closure_compile_module",
+      "system_page:closure_compile_module",
+    ]
   }
 
   if (is_win) {
@@ -676,11 +680,11 @@ group("polymer3_elements") {
     ":web_components_local",
   ]
 
-  if (!is_chromeos_ash) {
-    if (!is_chromeos_lacros) {
-      public_deps += [ "default_browser_page:web_components" ]
-    }
-    public_deps += [ "system_page:web_components" ]
+  if (!is_chromeos_ash && !is_chromeos_lacros) {
+    public_deps += [
+      "default_browser_page:web_components",
+      "system_page:web_components",
+    ]
   }
 
   if (is_win) {

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

@@ -183,7 +183,7 @@
                 <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page>
               </settings-section>
             </template>
-<if expr="not chromeos">
+<if expr="not chromeos and not lacros">
             <settings-section page-title="$i18n{systemPageTitle}"
                 section="system">
               <settings-system-page prefs="{{prefs}}"></settings-system-page>

chrome/browser/resources/settings/ensure_lazy_loaded.js

@@ -22,7 +22,7 @@ export function ensureLazyLoaded() {
       // </if>
       'settings-a11y-page', 'settings-downloads-page',
       'settings-languages-page', 'settings-reset-page',
-      // <if expr="not chromeos">
+      // <if expr="not chromeos and not lacros">
       'settings-system-page',
       // </if>
       // <if expr="not is_macosx">

chrome/browser/resources/settings/lazy_load.js

@@ -41,7 +41,7 @@ import './a11y_page/a11y_page.js';
 import './downloads_page/downloads_page.js';
 import './languages_page/languages_page.js';
 import './reset_page/reset_page.js';
-// <if expr="not chromeos">
+// <if expr="not chromeos and not lacros">
 import './system_page/system_page.js';
 // </if>
 

chrome/browser/resources/settings/route.js

@@ -185,7 +185,7 @@ function createBrowserSettingsRoutes() {
     }
     // </if>
 
-    // <if expr="not chromeos">
+    // <if expr="not chromeos and not lacros">
     r.SYSTEM = r.ADVANCED.createSection('/system', 'system');
     // </if>
 

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

@@ -172,7 +172,7 @@
                 <iron-icon icon="settings:accessibility"></iron-icon>
                 $i18n{a11yPageTitle}
               </a>
-    <if expr="not chromeos">
+    <if expr="not chromeos and not lacros">
               <a role="menuitem" href="/system"
                   disabled$="[[!advancedOpened]]">
                 <iron-icon icon="settings:build"></iron-icon>

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

@@ -545,13 +545,13 @@ GEN('#endif  //!defined(OS_MAC)');
 
 GEN('#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS)');
 [['DefaultBrowser', 'default_browser_browsertest.js'],
+ ['SystemPage', 'system_page_tests.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));
 GEN('#endif  // !defined(OS_CHROMEOS)');