Settings People Rewrite: Move users_page as subpage of People.

The user list control is a ChromeOS-only page that should be a subpage
of the new People section. (According to my understanding of the mocks.)

BUG=563721

Review URL: https://codereview.chromium.org/1503403004

Cr-Commit-Position: refs/heads/master@{#364784}

13 files changed, 75 insertions, 62 deletions

diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
index 4a7ac47..17d1405 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -8,7 +8,6 @@
 
 <if expr="chromeos">
 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
-<link rel="import" href="chrome://md-settings/users_page/users_page.html">
 </if>
 
 <if expr="not chromeos">
@@ -21,7 +20,7 @@
     <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
       <settings-section i18n-values="page-title:peoplePageTitle"
           current-route="[[currentRoute]]" section="people">
-        <settings-people-page current-route="{{currentRoute}}">
+        <settings-people-page prefs="{{prefs}}" current-route="{{currentRoute}}">
         </settings-people-page>
       </settings-section>
     </template>
@@ -57,15 +56,6 @@
         </settings-search-page>
       </settings-section>
     </template>
-<if expr="chromeos">
-    <template is="dom-if" if="[[showPage(pageVisibility.users)]]" restamp>
-      <settings-section i18n-values="page-title:usersPageTitle"
-          current-route="[[currentRoute]]" section="users">
-        <settings-users-page prefs="{{prefs}}"></settings-users-page>
-      </settings-section>
-    </template>
-</if>
-
 <if expr="not chromeos">
     <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]"
         restamp>
diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
index d298687..0b06547 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -9,6 +9,10 @@
 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.html">
 
+<if expr="chromeos">
+<link rel="import" href="chrome://md-settings/people_page/users_page.html">
+</if>
+
 <dom-module id="settings-people-page">
   <link rel="import" type="css"
       href="chrome://md-settings/settings_shared.css">
@@ -71,6 +75,13 @@
         <settings-sync-page current-route="[[currentRoute]]">
         </settings-sync-page>
       </neon-animatable>
+<if expr="chromeos">
+      <neon-animatable id="users">
+        <settings-subheader i18n-values="page-title:usersPageTitle">
+        </settings-subheader>
+        <settings-users-page prefs="{{prefs}}"></settings-users-page>
+      <neon-animatable>
+</if>
     </settings-animated-pages>
 
     <paper-dialog modal id="disconnectDialog">
diff --git a/chrome/browser/resources/settings/people_page/people_page.js b/chrome/browser/resources/settings/people_page/people_page.js
index 4cfd1ec..6a804f5 100644
--- a/chrome/browser/resources/settings/people_page/people_page.js
+++ b/chrome/browser/resources/settings/people_page/people_page.js
@@ -33,6 +33,14 @@ Polymer({
     },
 
     /**
+     * Preferences state.
+     */
+    prefs: {
+      type: Object,
+      notify: true,
+    },
+
+    /**
      * The current sync status, supplied by settings.SyncPrivateApi.
      * @type {?settings.SyncStatus}
      */
@@ -86,7 +94,12 @@ Polymer({
 
   /** @private */
   onManageOtherPeople_: function() {
+<if expr="not chromeos">
     settings.SyncPrivateApi.manageOtherPeople();
+</if>
+<if expr="chromeos">
+    this.$.pages.setSubpageChain(['users']);
+</if>
   },
 
   /**
diff --git a/chrome/browser/resources/settings/users_page/user_list.css b/chrome/browser/resources/settings/people_page/user_list.css
index 0db441c..0db441c 100644
--- a/chrome/browser/resources/settings/users_page/user_list.css
+++ b/chrome/browser/resources/settings/people_page/user_list.css
diff --git a/chrome/browser/resources/settings/users_page/user_list.html b/chrome/browser/resources/settings/people_page/user_list.html
index 579424d..579424d 100644
--- a/chrome/browser/resources/settings/users_page/user_list.html
+++ b/chrome/browser/resources/settings/people_page/user_list.html
diff --git a/chrome/browser/resources/settings/users_page/user_list.js b/chrome/browser/resources/settings/people_page/user_list.js
index 35bce23..35bce23 100644
--- a/chrome/browser/resources/settings/users_page/user_list.js
+++ b/chrome/browser/resources/settings/people_page/user_list.js
diff --git a/chrome/browser/resources/settings/users_page/users_page.css b/chrome/browser/resources/settings/people_page/users_page.css
index 17db8f1..46166f5 100644
--- a/chrome/browser/resources/settings/users_page/users_page.css
+++ b/chrome/browser/resources/settings/people_page/users_page.css
@@ -10,10 +10,6 @@
   padding-top: 25px;
 }
 
-.page-content > div {
-  margin-top: 30px;
-}
-
 .users {
   -webkit-margin-start: 50px;
 }
diff --git a/chrome/browser/resources/settings/users_page/users_page.html b/chrome/browser/resources/settings/people_page/users_page.html
index 86343c7..1a42152 100644
--- a/chrome/browser/resources/settings/users_page/users_page.html
+++ b/chrome/browser/resources/settings/people_page/users_page.html
@@ -8,40 +8,39 @@
 <link rel="import" href="user_list.html">
 
 <dom-module id="settings-users-page">
-  <link rel="import" type="css"
-      href="chrome://md-settings/settings_shared.css">
+  <link rel="import" type="css" href="chrome://md-settings/settings_shared.css">
   <link rel="import" type="css" href="users_page.css">
   <template>
-    <div class="page-content">
-      <div i18n-content="usersModifiedByOwnerLabel"
-          hidden$="{{computeHideOwnerLabel_(isOwner, isWhitelistManaged)}}">
-      </div>
-      <div i18n-content="settingsManagedLabel"
-          hidden$="{{computeHideManagedLabel_(isOwner, isWhitelistManaged)}}">
-      </div>
-      <div>
-        <settings-checkbox
-            pref="{{prefs.cros.accounts.allowBWSI}}"
-            i18n-values="label:guestBrowsingLabel"
-            disabled="{{editingDisabled}}">
-        </settings-checkbox>
-        <settings-checkbox
-            pref="{{prefs.cros.accounts.supervisedUsersEnabled}}"
-            i18n-values="label:supervisedUsersLabel"
-            disabled="{{editingDisabled}}">
-        </settings-checkbox>
-        <settings-checkbox
-            pref="{{prefs.cros.accounts.showUserNamesOnSignIn}}"
-            i18n-values="label:showOnSigninLabel"
-            disabled="{{editingDisabled}}">
-        </settings-checkbox>
-        <settings-checkbox
-            pref="{{prefs.cros.accounts.allowGuest}}"
-            id="restrictSignIn"
-            i18n-values="label:restrictSigninLabel"
-            disabled="{{editingDisabled}}" inverted>
-        </settings-checkbox>
-      </div>
+    <div class="settings-box" i18n-content="usersModifiedByOwnerLabel"
+        hidden$="{{computeHideOwnerLabel_(isOwner, isWhitelistManaged)}}">
+    </div>
+    <div class="settings-box" i18n-content="settingsManagedLabel"
+        hidden$="{{computeHideManagedLabel_(isOwner, isWhitelistManaged)}}">
+    </div>
+    <div class="settings-box">
+      <settings-checkbox
+          pref="{{prefs.cros.accounts.allowBWSI}}"
+          i18n-values="label:guestBrowsingLabel"
+          disabled="{{editingDisabled}}">
+      </settings-checkbox>
+      <settings-checkbox
+          pref="{{prefs.cros.accounts.supervisedUsersEnabled}}"
+          i18n-values="label:supervisedUsersLabel"
+          disabled="{{editingDisabled}}">
+      </settings-checkbox>
+      <settings-checkbox
+          pref="{{prefs.cros.accounts.showUserNamesOnSignIn}}"
+          i18n-values="label:showOnSigninLabel"
+          disabled="{{editingDisabled}}">
+      </settings-checkbox>
+    </div>
+    <div class="settings-box">
+      <settings-checkbox
+          pref="{{prefs.cros.accounts.allowGuest}}"
+          id="restrictSignIn"
+          i18n-values="label:restrictSigninLabel"
+          disabled="{{editingDisabled}}" inverted>
+      </settings-checkbox>
       <div class="users">
         <div>
           <settings-user-list prefs="[[prefs]]"
diff --git a/chrome/browser/resources/settings/users_page/users_page.js b/chrome/browser/resources/settings/people_page/users_page.js
index da31d39..da31d39 100644
--- a/chrome/browser/resources/settings/users_page/users_page.js
+++ b/chrome/browser/resources/settings/people_page/users_page.js
diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html
index 5c4ce54..d615b8e 100644
--- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
+++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
@@ -44,12 +44,6 @@
             <iron-icon icon="search" item-icon></iron-icon>
             <span i18n-content="searchPageTitle"></span>
           </paper-icon-item>
-<if expr="chromeos">
-          <paper-icon-item>
-            <iron-icon icon="person" item-icon></iron-icon>
-            <span i18n-content="usersPageTitle"></span>
-          </paper-icon-item>
-</if>
 <if expr="not chromeos">
           <paper-icon-item>
             <iron-icon icon="open-in-browser" item-icon></iron-icon>
diff --git a/chrome/browser/resources/settings/settings_page/settings_router.js b/chrome/browser/resources/settings/settings_page/settings_router.js
index 02e4771..8ff4a8a 100644
--- a/chrome/browser/resources/settings/settings_page/settings_router.js
+++ b/chrome/browser/resources/settings/settings_page/settings_router.js
@@ -118,6 +118,15 @@ Polymer({
       subpage: ['sync'],
       subpageTitles: ['syncPageTitle'],
     },
+<if expr="chromeos">
+    {
+      url: '/accounts',
+      page: 'basic',
+      section: 'people',
+      subpage: ['users'],
+      subpageTitles: ['usersPageTitle'],
+    },
+</if>
     {
       url: '/certificates',
       page: 'advanced',
diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd
index 5b28fe5..1a10679 100644
--- a/chrome/browser/resources/settings/settings_resources.grd
+++ b/chrome/browser/resources/settings/settings_resources.grd
@@ -322,7 +322,9 @@
                  type="chrome_html" />
       <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"
                  file="people_page/people_page.js"
-                 type="chrome_html" />
+                 type="chrome_html"
+                 flattenhtml="true"
+                 allowexternalscript="true" />
       <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"
                  file="people_page/people_page.html"
                  type="chrome_html"
@@ -642,26 +644,26 @@
                    file="internet_page/network_summary_item.js"
                    type="chrome_html" />
         <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS"
-                   file="users_page/user_list.js"
+                   file="people_page/user_list.js"
                    type="chrome_html" />
         <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML"
-                   file="users_page/user_list.html"
+                   file="people_page/user_list.html"
                    type="chrome_html"
                    flattenhtml="true"
                    allowexternalscript="true" />
         <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS"
-                   file="users_page/user_list.css"
+                   file="people_page/user_list.css"
                    type="chrome_html" />
         <structure name="IDR_SETTINGS_USERS_PAGE_JS"
-                   file="users_page/users_page.js"
+                   file="people_page/users_page.js"
                    type="chrome_html" />
         <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
-                   file="users_page/users_page.html"
+                   file="people_page/users_page.html"
                    type="chrome_html"
                    flattenhtml="true"
                    allowexternalscript="true" />
         <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
-                   file="users_page/users_page.css"
+                   file="people_page/users_page.css"
                    type="chrome_html" />
       </if>
     </structures>
diff --git a/chrome/test/data/webui/settings/main_page_browsertest.js b/chrome/test/data/webui/settings/main_page_browsertest.js
index 8fd9a5e..5035b44 100644
--- a/chrome/test/data/webui/settings/main_page_browsertest.js
+++ b/chrome/test/data/webui/settings/main_page_browsertest.js
@@ -40,13 +40,12 @@ TEST_F('SettingsMainPageBrowserTest', 'MAYBE_Main', function() {
       var page = self.getPage('basic');
       expectTrue(!!self.getSection(page, 'appearance'));
       expectTrue(!!self.getSection(page, 'onStartup'));
+      expectTrue(!!self.getSection(page, 'people'));
       expectTrue(!!self.getSection(page, 'search'));
       if (!cr.isChromeOS) {
-        expectTrue(!!self.getSection(page, 'people'));
         expectTrue(!!self.getSection(page, 'defaultBrowser'));
       } else {
         expectTrue(!!self.getSection(page, 'internet'));
-        expectTrue(!!self.getSection(page, 'users'));
       }
     });