Add Parental Controls section back to main settings page

It's now part of the People section.

Bug: 927957
Change-Id: I3ee88d4fce66896613806d74ad4787670e658eb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1702167Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Danan S <danan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678482}

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

@@ -224,6 +224,10 @@
           </settings-subpage>
         </template>
       </template>
+      <template is="dom-if" if="[[showParentalControls_]]">
+        <settings-parental-controls-page>
+        </settings-parental-controls-page>
+      </template>
       <template is="dom-if" route-path="/accounts">
         <settings-subpage
             associated-control="[[$$('#manage-other-people-subpage-trigger')]]"

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

@@ -115,6 +115,15 @@ Polymer({
       readOnly: true,
     },
 
+    /** @private */
+    showParentalControls_: {
+      type: Boolean,
+      value: function() {
+        return loadTimeData.valueExists('showParentalControls') &&
+            loadTimeData.getBoolean('showParentalControls');
+      },
+    },
+
     /** @private {!Map<string, string>} */
     focusConfig_: {
       type: Object,

chrome/browser/resources/settings/people_page/people_page.html

@@ -34,6 +34,7 @@
 <link rel="import" href="lock_screen.html">
 <link rel="import" href="lock_state_behavior.html">
 <link rel="import" href="users_page.html">
+<link rel="import" href="../parental_controls_page/parental_controls_page.html">
 </if>
 <if expr="not chromeos">
 <link rel="import" href="chrome://resources/cr_elements/cr_toast/cr_toast.html">
@@ -272,7 +273,10 @@
               on-click="onAccountManagerTap_"
               label="$i18n{accountManagerSubMenuLabel}"></cr-link-row>
         </template>
-
+        <template is="dom-if" if="[[showParentalControls_]]">
+          <settings-parental-controls-page>
+          </settings-parental-controls-page>
+        </template>
         <cr-link-row id="manage-other-people-subpage-trigger"
             label="$i18n{manageOtherPeople}" on-click="onManageOtherPeople_"
             hidden="[[!pageVisibility.people.manageUsers]]">

chrome/browser/resources/settings/people_page/people_page.js

@@ -151,6 +151,15 @@ Polymer({
       },
       readOnly: true,
     },
+
+    /** @private */
+    showParentalControls_: {
+      type: Boolean,
+      value: function() {
+        return loadTimeData.valueExists('showParentalControls') &&
+            loadTimeData.getBoolean('showParentalControls');
+      },
+    },
     // </if>
 
     /** @private {!Map<string, string>} */

chrome/browser/resources/settings/people_page/users_page.html

@@ -10,10 +10,6 @@
 <link rel="import" href="user_list.html">
 <link rel="import" href="users_add_user_dialog.html">
 
-<if expr="chromeos">
-<link rel="import" href="../parental_controls_page/parental_controls_page.html">
-</if>
-
 <dom-module id="settings-users-page">
   <template>
     <style include="settings-shared action-link">
@@ -72,13 +68,6 @@
         </a>
       </div>
     </div>
-<if expr="chromeos">
-    <template is="dom-if" if="[[showParentalControls_]]">
-      <h2 id="header" class="title">$i18n{parentalControlsPageTitle}</h2>
-      <settings-parental-controls-page>
-      </settings-parental-controls-page>
-    </template>
-</if>
     <settings-users-add-user-dialog id="addUserDialog"
         on-close="onAddUserDialogClose_">
     </settings-users-add-user-dialog>

chrome/browser/resources/settings/people_page/users_page.js

@@ -30,19 +30,6 @@ Polymer({
       type: Boolean,
       value: false,
     },
-
-    /** @private */
-    showParentalControls_: {
-      type: Boolean,
-      value: false,
-    },
-  },
-
-  /** @override */
-  ready: function() {
-    this.showParentalControls_ =
-        loadTimeData.valueExists('showParentalControls') &&
-        loadTimeData.getBoolean('showParentalControls');
   },
 
   /** @override */