Settings: Hide fingerprint setup from options.

Currently the fingerprint setup shows up on options, but does not work properly, possibly due to reliance on MD Settings code. Hide the fingerprint stuff on options, it is not needed for options. Also, the enable screen lock toggle was showing when it should be hidden.

TEST=manual
BUG=693144
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2698773004
Cr-Commit-Position: refs/heads/master@{#453275}

chrome/browser/resources/options/chromeos/quick_unlock_configure_overlay.js

@@ -65,10 +65,15 @@ cr.define('options', function() {
       settings.navigateTo(settings.Route.LOCK_SCREEN);
       var lockScreen = document.querySelector('settings-lock-screen');
 
-      var checkbox =
-          lockScreen.root.querySelector(
-              'div.settings-box.single-column.screen-lock');
-      checkbox.hidden = true;
+      // On settings the screen lock is part of the lock screen, but on options
+      // it is already part of the sync page, so hide the lock screen version on
+      // options.
+      var screenLockDiv = lockScreen.root.querySelector('#screenLockDiv');
+      screenLockDiv.hidden = true;
+
+      // The fingerprint settings on options is always hidden.
+      var fingerprintDiv = lockScreen.root.querySelector('#fingerprintDiv');
+      fingerprintDiv.hidden = true;
 
       var passwordPrompt = lockScreen.root.
           querySelector('settings-password-prompt-dialog');

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

@@ -42,7 +42,7 @@
         </div>
       </div>
 
-      <div class="settings-box">
+      <div id="screenLockDiv" class="settings-box">
         <settings-toggle-button class="start"
             pref="{{prefs.settings.enable_screen_lock}}"
             label="$i18n{enableScreenlock}">
@@ -50,27 +50,29 @@
       </div>
 
       <template is="dom-if" if="[[fingerprintUnlockEnabled_]]">
-        <div class="settings-box">
-          <settings-toggle-button class="start"
-              pref="{{prefs.settings.enable_quick_unlock_fingerprint}}"
-              label="$i18n{lockScreenFingerprintEnable}">
-          </settings-toggle-button>
-        </div>
-        <iron-collapse
-            opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]">
-          <div class="settings-box continuation" on-tap="onEditFingerprints_"
-              actionable>
-            <div class="start">
-              $i18n{lockScreenEditFingerprints}
-              <div class="secondary" id="lockScreenEditFingerprintsSecondary">
-                [[getDescriptionText_(numFingerprints_)]]
+        <div id="fingerprintDiv">
+          <div class="settings-box">
+            <settings-toggle-button class="start"
+                pref="{{prefs.settings.enable_quick_unlock_fingerprint}}"
+                label="$i18n{lockScreenFingerprintEnable}">
+            </settings-toggle-button>
+          </div>
+          <iron-collapse
+              opened="[[prefs.settings.enable_quick_unlock_fingerprint.value]]">
+            <div class="settings-box continuation" on-tap="onEditFingerprints_"
+                actionable>
+              <div class="start">
+                $i18n{lockScreenEditFingerprints}
+                <div class="secondary" id="lockScreenEditFingerprintsSecondary">
+                  [[getDescriptionText_(numFingerprints_)]]
+                </div>
               </div>
+              <button class="subpage-arrow" is="paper-icon-button-light"
+                  aria-label="$i18n{lockScreenEditFingerprints}"
+                  aria-describedby="lockScreenEditFingerprintsSecondary"></button>
             </div>
-            <button class="subpage-arrow" is="paper-icon-button-light"
-                aria-label="$i18n{lockScreenEditFingerprints}"
-                aria-describedby="lockScreenEditFingerprintsSecondary"></button>
-          </div>
-        </iron-collapse>
+          </iron-collapse>
+        </div>
       </template>
 
       <settings-password-prompt-dialog id="passwordPrompt"