Rework quick unlock settings to follow new specs.

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

Index: chrome/browser/resources/settings/people_page/people_page.html
diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
index 0e41e7b1ecb04235b8b25ba30498d88365fe9e2c..13b2f0a167460beee9f9b2e587217266ba58a8fa 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -1,4 +1,5 @@
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
@@ -18,9 +19,8 @@
 <link rel="import" href="/people_page/change_picture.html">
 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html">
 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html">
-<link rel="import" href="/people_page/quick_unlock_authenticate.html">
-<link rel="import" href="/people_page/quick_unlock_choose_method.html">
-<link rel="import" href="/people_page/quick_unlock_setup_pin.html">
+<link rel="import" href="/people_page/lock_screen.html">
+<link rel="import" href="/people_page/lock_state_behavior.html">
 <link rel="import" href="/people_page/users_page.html">
 </if>
 <if expr="not chromeos">
@@ -160,19 +160,24 @@
         </div>
 
 <if expr="chromeos">
-        <div class="settings-box single-column">
-          <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
-              label="$i18n{enableScreenlock}">
-          </settings-checkbox>
-        </div>
+        <template is="dom-if" if="[[!quickUnlockEnabled_]]">
+          <div class="settings-box single-column">
+            <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
+                label="$i18n{enableScreenlock}">
+            </settings-checkbox>
+          </div>
+        </template>
 
-        <!-- TODO(jdufault): Disable navigating to /quickUnlock/* if pin is
-          disabled. -->
-        <template is="dom-if" if=[[quickUnlockEnabled_]]>
-          <div class="settings-box">
-            <paper-button on-tap="onQuickUnlockTap_" class="primary-button">
-              $i18n{quickUnlockTitle}
-            </paper-button>
+        <template is="dom-if" if="[[quickUnlockEnabled_]]">
+          <div class="settings-box two-line" actionable
+               on-tap="onConfigureLockTap_">
+            <div class="middle">
+              <div>$i18n{lockScreenTitle}</div>
+              <div class="secondary">
+                [[getPasswordState_(hasPin,
+                                    prefs.settings.enable_screen_lock.value)]]
+              </div>
+            </div>
           </div>
         </template>
 
@@ -244,26 +249,14 @@
         </template>
       </template>
 <if expr="chromeos">
-      <template is="dom-if" name="quick-unlock-authenticate" no-search>
-        <settings-subpage page-title="$i18n{quickUnlockTitle}">
-          <settings-quick-unlock-authenticate
-              set-modes="{{quickUnlockSetModes}}"
-              profile-name="[[profileName_]]">
-          </settings-quick-unlock-authenticate>
-        </settings-subpage>
-      </template>
-      <template is="dom-if" name="quick-unlock-choose-method" no-search>
-        <settings-subpage page-title="$i18n{quickUnlockTitle}">
-          <settings-quick-unlock-choose-method
-              set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}">
-          </settings-quick-unlock-choose-method>
-        </settings-subpage>
-      </template>
-      <template is="dom-if" name="quick-unlock-setup-pin" no-search>
-        <settings-subpage page-title="$i18n{quickUnlockTitle}">
-          <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]">
-          </settings-quick-unlock-setup-pin>
-        </settings-subpage>
+      <template is="dom-if" if="[[quickUnlockEnabled_]]">
+        <template is="dom-if" name="lockScreen">
+          <settings-subpage page-title="$i18n{lockScreenTitle}">
+            <settings-lock-screen
+              prefs="{{prefs}}">
+            </settings-lock-screen>
+          </settings-subpage>
+        </template>
       </template>
       <template is="dom-if" name="users">
         <settings-subpage