Move 'Privacy and security' to the 'Basic' section

Note: we don't move privacy page from the lazy bundle to the main bundle
because it was already a part of the main bundle erroneously,
see https://crbug.com/1157207.

Bug: 1148246
Change-Id: Ic2cadf3c129e3f2fb99499aefd35f1c45cde967f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2563460
Commit-Queue: Anastasiia N <anastasiian@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837011}

chrome/browser/resources/settings/chromeos/ensure_lazy_loaded.m.js

@@ -11,15 +11,19 @@ export function ensureLazyLoaded() {
     script.type = 'module';
     script.src = './lazy_load.js';
     document.body.appendChild(script);
-
-    lazyLoadPromise = Promise.all([
+    const lazyLoadPages = [
       'os-settings-powerwash-dialog',
-      'os-settings-privacy-page',
       'os-settings-reset-page',
       'os-settings-files-page',
       'settings-smb-shares-page',
       'os-printing-page',
-    ].map(name => customElements.whenDefined(name)));
+    ];
+    if (!loadTimeData.getBoolean('isAccountManagementFlowsV2Enabled')) {
+      lazyLoadPages.push('os-settings-privacy-page');
+    }
+
+    lazyLoadPromise = Promise.all(
+        lazyLoadPages.map(name => customElements.whenDefined(name)));
   }
   return lazyLoadPromise;
 }

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

@@ -8,7 +8,6 @@
   <link rel="import" href="os_files_page/os_files_page.html">
   <link rel="import" href="os_languages_page/os_languages_section.html">
   <link rel="import" href="os_printing_page/os_printing_page.html">
-  <link rel="import" href="os_privacy_page/os_privacy_page.html">
   <link rel="import" href="os_reset_page/os_reset_page.html">
 </body>
 </html>

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

@@ -242,10 +242,11 @@ cr.define('settings', function() {
         r.DATETIME, mojom.TIME_ZONE_SUBPAGE_PATH, Subpage.kTimeZone);
 
     // Privacy and Security section.
-    r.OS_PRIVACY = createSection(
-        r.ADVANCED, mojom.PRIVACY_AND_SECURITY_SECTION_PATH,
-        Section.kPrivacyAndSecurity);
+
     if (loadTimeData.getBoolean('isAccountManagementFlowsV2Enabled')) {
+      r.OS_PRIVACY = createSection(
+          r.BASIC, mojom.PRIVACY_AND_SECURITY_SECTION_PATH,
+          Section.kPrivacyAndSecurity);
       r.LOCK_SCREEN = createSubpage(
           r.OS_PRIVACY, mojom.SECURITY_AND_SIGN_IN_SUBPAGE_PATH_V2,
           Subpage.kSecurityAndSignInV2);
@@ -255,6 +256,10 @@ cr.define('settings', function() {
       r.ACCOUNTS = createSubpage(
           r.OS_PRIVACY, mojom.MANAGE_OTHER_PEOPLE_SUBPAGE_PATH_V2,
           Subpage.kManageOtherPeopleV2);
+    } else {
+      r.OS_PRIVACY = createSection(
+          r.ADVANCED, mojom.PRIVACY_AND_SECURITY_SECTION_PATH,
+          Section.kPrivacyAndSecurity);
     }
 
     // Languages and Input section.

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

@@ -194,6 +194,12 @@
         <iron-icon icon="cr:search"></iron-icon>
         $i18n{osSearchPageTitle}
       </a>
+      <template is="dom-if" if="[[isAccountManagementFlowsV2Enabled_]]">
+        <a href="/osPrivacy" class="item">
+          <iron-icon icon="cr:security"></iron-icon>
+          $i18n{privacyPageTitle}
+        </a>
+      </template>
       <a href="/apps" class="item">
         <iron-icon icon="os-settings:apps"></iron-icon>
         $i18n{appsPageTitle}
@@ -220,10 +226,12 @@
             <iron-icon icon="os-settings:access-time"></iron-icon>
             $i18n{dateTimePageTitle}
           </a>
-          <a href="/osPrivacy" class="item">
+          <template is="dom-if" if="[[!isAccountManagementFlowsV2Enabled_]]">
+            <a href="/osPrivacy" class="item">
               <iron-icon icon="cr:security"></iron-icon>
               $i18n{privacyPageTitle}
-          </a>
+            </a>
+          </template>
           <a href="/osLanguages" class="item">
             <iron-icon icon="os-settings:language"></iron-icon>
             $i18n{osLanguagesPageTitle}

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

@@ -35,6 +35,18 @@ Polymer({
     showReset: Boolean,
 
     showKerberosSection: Boolean,
+
+    /**
+     * True if redesign of account management flows is enabled.
+     * @private
+     */
+    isAccountManagementFlowsV2Enabled_: {
+      type: Boolean,
+      value() {
+        return loadTimeData.getBoolean('isAccountManagementFlowsV2Enabled');
+      },
+      readOnly: true,
+    },
   },
 
   /** @param {!settings.Route} newRoute */

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

@@ -186,6 +186,13 @@
           <os-settings-search-page prefs="{{prefs}}">
           </os-settings-search-page>
         </settings-section>
+        <template is="dom-if" if="[[isAccountManagementFlowsV2Enabled_]]">
+          <settings-section page-title="$i18n{privacyPageTitle}"
+              section="osPrivacy">
+            <os-settings-privacy-page prefs="{{prefs}}">
+            </os-settings-privacy-page>
+          </settings-section>
+        </template>
         <settings-section page-title="$i18n{appsPageTitle}" section="apps">
           <os-settings-apps-page
               prefs="{{prefs}}"
@@ -237,11 +244,13 @@
             <settings-date-time-page prefs="{{prefs}}">
             </settings-date-time-page>
           </settings-section>
-          <settings-section page-title="$i18n{privacyPageTitle}"
-              section="osPrivacy">
-            <os-settings-privacy-page prefs="{{prefs}}">
-            </os-settings-privacy-page>
-          </settings-section>
+          <template is="dom-if" if="[[!isAccountManagementFlowsV2Enabled_]]">
+            <settings-section page-title="$i18n{privacyPageTitle}"
+                section="osPrivacy">
+              <os-settings-privacy-page prefs="{{prefs}}">
+              </os-settings-privacy-page>
+            </settings-section>
+          </template>
           <settings-section page-title="$i18n{osLanguagesPageTitle}"
               section="osLanguages">
             <os-settings-languages-section prefs="{{prefs}}">

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

@@ -103,6 +103,18 @@ Polymer({
 
     /** @private {!settings.Route|undefined} */
     currentRoute_: Object,
+
+    /**
+     * True if redesign of account management flows is enabled.
+     * @private
+     */
+    isAccountManagementFlowsV2Enabled_: {
+      type: Boolean,
+      value() {
+        return loadTimeData.getBoolean('isAccountManagementFlowsV2Enabled');
+      },
+      readOnly: true,
+    },
   },
 
   hostAttributes: {