Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(518)

Side by Side Diff: chrome/browser/resources/options/chromeos/quick_unlock_configure_overlay.js

Issue 2787153002: MD Settings: Move easy unlock from people to lock screen. (Closed)
Patch Set: Closure. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/options/compiled_resources.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 onPolymerLoaded_: function() { 67 onPolymerLoaded_: function() {
68 settings.navigateTo(settings.Route.LOCK_SCREEN); 68 settings.navigateTo(settings.Route.LOCK_SCREEN);
69 var lockScreen = document.querySelector('settings-lock-screen'); 69 var lockScreen = document.querySelector('settings-lock-screen');
70 70
71 // On settings the screen lock is part of the lock screen, but on options 71 // On settings the screen lock is part of the lock screen, but on options
72 // it is already part of the sync page, so hide the lock screen version on 72 // it is already part of the sync page, so hide the lock screen version on
73 // options. 73 // options.
74 var screenLockDiv = lockScreen.root.querySelector('#screenLockDiv'); 74 var screenLockDiv = lockScreen.root.querySelector('#screenLockDiv');
75 screenLockDiv.hidden = true; 75 screenLockDiv.hidden = true;
76 76
77 // The fingerprint settings on options is always hidden. 77 // The fingerprint settings and easy unlock on options is always hidden.
78 var fingerprintDiv = lockScreen.root.querySelector('#fingerprintDiv'); 78 var fingerprintDiv = lockScreen.root.querySelector('#fingerprintDiv');
79 fingerprintDiv.hidden = true; 79 fingerprintDiv.hidden = true;
80 var easyUnlockDiv = lockScreen.root.querySelector('#easyUnlock');
81 easyUnlockDiv.hidden = true;
80 82
81 var passwordPrompt = lockScreen.root. 83 var passwordPrompt = lockScreen.root.
82 querySelector('settings-password-prompt-dialog'); 84 querySelector('settings-password-prompt-dialog');
83 passwordPrompt.addEventListener('close', function() { 85 passwordPrompt.addEventListener('close', function() {
84 if (!lockScreen.setModes_) { 86 if (!lockScreen.setModes_) {
85 QuickUnlockConfigureOverlay.dismiss(); 87 QuickUnlockConfigureOverlay.dismiss();
86 } 88 }
87 }.bind(this)); 89 }.bind(this));
88 }, 90 },
89 }; 91 };
90 92
91 QuickUnlockConfigureOverlay.dismiss = function() { 93 QuickUnlockConfigureOverlay.dismiss = function() {
92 PageManager.closeOverlay(); 94 PageManager.closeOverlay();
93 }; 95 };
94 96
95 // Export 97 // Export
96 return { 98 return {
97 QuickUnlockConfigureOverlay: QuickUnlockConfigureOverlay 99 QuickUnlockConfigureOverlay: QuickUnlockConfigureOverlay
98 }; 100 };
99 }); 101 });
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/compiled_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698