md settings: Show lock screen when pin/fingerprint disabled.

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

 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/icon.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/util.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
@@ skipping 171 matching lines @@
                 [[syncStatus.statusText]]
               </div>
             </div>
             <button class="subpage-arrow" is="paper-icon-button-light"
                 aria-label="$i18n{sync}"
                 aria-describedby="syncSecondary"></button>
           </div>
         </template>
 
 <if expr="chromeos">
-        <template is="dom-if" if="[[!quickUnlockEnabled_]]">
-          <div class="settings-box">
-            <settings-toggle-button class="start"
-                pref="{{prefs.settings.enable_screen_lock}}"
-                label="$i18n{enableScreenlock}">
-            </settings-toggle-button>
+        <div class="settings-box two-line" actionable
+             on-tap="onConfigureLockTap_">
+          <div class="start">
+            $i18n{lockScreenTitle}
+            <div class="secondary" id="lockScreenSecondary">
+              [[getPasswordState_(hasPin,
+                                  prefs.settings.enable_screen_lock.value)]]
+            </div>
           </div>
-        </template>
-
-        <template is="dom-if" if="[[quickUnlockEnabled_]]">
-          <div class="settings-box two-line" actionable
-               on-tap="onConfigureLockTap_">
-            <div class="start">
-              $i18n{lockScreenTitle}
-              <div class="secondary" id="lockScreenSecondary">
-                [[getPasswordState_(hasPin,
-                                    prefs.settings.enable_screen_lock.value)]]
-              </div>
-            </div>
-            <button id="lockScreenSubpageTrigger" class="subpage-arrow"
-                is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}"
-                aria-describedby="lockScrenSecondary"></button>
-          </div>
-        </template>
+          <button id="lockScreenSubpageTrigger" class="subpage-arrow"
+              is="paper-icon-button-light" aria-label="$i18n{lockScreenTitle}"
+              aria-describedby="lockScrenSecondary"></button>
+        </div>
 </if>
 
         <div id="manage-other-people-subpage-trigger"
             class="settings-box" on-tap="onManageOtherPeople_" actionable>
           <div class="start">$i18n{manageOtherPeople}</div>
           <button class="subpage-arrow" is="paper-icon-button-light"
               aria-label="$i18n{manageOtherPeople}"></button>
         </div>
 
 <if expr="not chromeos">
@@ skipping 19 matching lines @@
       <template is="dom-if" route-path="/syncSetup"
           no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]">
         <settings-subpage
             associated-control="[[$$('#sync-status')]]"
             page-title="$i18n{syncPageTitle}"
             no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]">
           <settings-sync-page></settings-sync-page>
         </settings-subpage>
       </template>
 <if expr="chromeos">
-      <template is="dom-if" if="[[quickUnlockEnabled_]]">
-        <template is="dom-if" route-path="/lockScreen" no-search>
-          <settings-subpage page-title="$i18n{lockScreenTitle}">
-            <settings-lock-screen
-              prefs="{{prefs}}">
-            </settings-lock-screen>
-          </settings-subpage>
-        </template>
+      <template is="dom-if" route-path="/lockScreen" no-search>
+        <settings-subpage page-title="$i18n{lockScreenTitle}">
+          <settings-lock-screen
+            prefs="{{prefs}}">
+          </settings-lock-screen>
+        </settings-subpage>
+      </template>
+      <template is="dom-if" if="[[fingerprintUnlockEnabled_]]">
         <template is="dom-if" route-path="/lockScreen/fingerprint" no-search>
           <settings-subpage page-title="$i18n{lockScreenFingerprintTitle}">
             <settings-fingerprint-list></settings-fingerprint-list>
           </settings-subpage>
         </template>
       </template>
       <template is="dom-if" route-path="/accounts">
         <settings-subpage
             associated-control="[[$$('#manage-other-people-subpage-trigger')]]"
             page-title="$i18n{usersPageTitle}">
@@ skipping 70 matching lines @@
 
     <template is="dom-if" if="[[showImportDataDialog_]]" restamp>
       <settings-import-data-dialog prefs="{{prefs}}"
           on-close="onImportDataDialogClosed_">
       </settings-import-data-dialog>
     </template>
 
   </template>
   <script src="people_page.js"></script>
 </dom-module>