OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 cr.define('options', function() { | 5 cr.define('options', function() { |
6 var Page = cr.ui.pageManager.Page; | 6 var Page = cr.ui.pageManager.Page; |
7 var PageManager = cr.ui.pageManager.PageManager; | 7 var PageManager = cr.ui.pageManager.PageManager; |
8 | 8 |
9 /** | 9 /** |
10 * QuickUnlockConfigureOverlay class | 10 * QuickUnlockConfigureOverlay class |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 }, | 58 }, |
59 | 59 |
60 /** | 60 /** |
61 * Called when polymer has been loaded and the dialog should be displayed. | 61 * Called when polymer has been loaded and the dialog should be displayed. |
62 * @private | 62 * @private |
63 */ | 63 */ |
64 onPolymerLoaded_: function() { | 64 onPolymerLoaded_: function() { |
65 settings.navigateTo(settings.Route.LOCK_SCREEN); | 65 settings.navigateTo(settings.Route.LOCK_SCREEN); |
66 var lockScreen = document.querySelector('settings-lock-screen'); | 66 var lockScreen = document.querySelector('settings-lock-screen'); |
67 | 67 |
68 var checkbox = | 68 // On settings the screen lock is part of the lock screen, but on options |
69 lockScreen.root.querySelector( | 69 // it is already part of the sync page, so hide the lock screen version on |
70 'div.settings-box.single-column.screen-lock'); | 70 // options. |
71 checkbox.hidden = true; | 71 var screenLockDiv = lockScreen.root.querySelector('#screenLockDiv'); |
| 72 screenLockDiv.hidden = true; |
| 73 |
| 74 // The fingerprint settings on options is always hidden. |
| 75 var fingerprintDiv = lockScreen.root.querySelector('#fingerprintDiv'); |
| 76 fingerprintDiv.hidden = true; |
72 | 77 |
73 var passwordPrompt = lockScreen.root. | 78 var passwordPrompt = lockScreen.root. |
74 querySelector('settings-password-prompt-dialog'); | 79 querySelector('settings-password-prompt-dialog'); |
75 passwordPrompt.addEventListener('close', function() { | 80 passwordPrompt.addEventListener('close', function() { |
76 if (!lockScreen.setModes_) { | 81 if (!lockScreen.setModes_) { |
77 QuickUnlockConfigureOverlay.dismiss(); | 82 QuickUnlockConfigureOverlay.dismiss(); |
78 } | 83 } |
79 }.bind(this)); | 84 }.bind(this)); |
80 }, | 85 }, |
81 }; | 86 }; |
82 | 87 |
83 QuickUnlockConfigureOverlay.dismiss = function() { | 88 QuickUnlockConfigureOverlay.dismiss = function() { |
84 PageManager.closeOverlay(); | 89 PageManager.closeOverlay(); |
85 }; | 90 }; |
86 | 91 |
87 // Export | 92 // Export |
88 return { | 93 return { |
89 QuickUnlockConfigureOverlay: QuickUnlockConfigureOverlay | 94 QuickUnlockConfigureOverlay: QuickUnlockConfigureOverlay |
90 }; | 95 }; |
91 }); | 96 }); |
OLD | NEW |