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

Side by Side Diff: chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js

Issue 2160423002: Fix search always navigating to quick unlock authenticate screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 years, 5 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/settings/people_page/quick_unlock_setup_pin.js » ('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 /** 5 /**
6 * @fileoverview 6 * @fileoverview
7 * 'settings-quick-unlock-choose-method' allows the user to change how they 7 * 'settings-quick-unlock-choose-method' allows the user to change how they
8 * unlock their device. Note that setting up the unlock method is delegated 8 * unlock their device. Note that setting up the unlock method is delegated
9 * to other elements. 9 * to other elements.
10 * 10 *
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 this.updateUnlockType_(); 72 this.updateUnlockType_();
73 } 73 }
74 }.bind(this); 74 }.bind(this);
75 this.boundOnActiveModesChanged_ = this.updateUnlockType_.bind(this); 75 this.boundOnActiveModesChanged_ = this.updateUnlockType_.bind(this);
76 76
77 chrome.settingsPrivate.onPrefsChanged.addListener( 77 chrome.settingsPrivate.onPrefsChanged.addListener(
78 this.boundOnPrefsChanged_); 78 this.boundOnPrefsChanged_);
79 chrome.quickUnlockPrivate.onActiveModesChanged.addListener( 79 chrome.quickUnlockPrivate.onActiveModesChanged.addListener(
80 this.boundOnActiveModesChanged_); 80 this.boundOnActiveModesChanged_);
81 81
82 this.askForPasswordIfUnset(); 82 if (this.isScreenActive(QuickUnlockScreen.CHOOSE_METHOD))
83 this.askForPasswordIfUnset();
83 }, 84 },
84 85
85 /** @override */ 86 /** @override */
86 detached: function() { 87 detached: function() {
87 chrome.settingsPrivate.onPrefsChanged.removeListener( 88 chrome.settingsPrivate.onPrefsChanged.removeListener(
88 this.boundOnPrefsChanged_); 89 this.boundOnPrefsChanged_);
89 chrome.quickUnlockPrivate.onActiveModesChanged.removeListener( 90 chrome.quickUnlockPrivate.onActiveModesChanged.removeListener(
90 this.boundOnActiveModesChanged_); 91 this.boundOnActiveModesChanged_);
91 }, 92 },
92 93
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 onConfigurePin_: function() { 175 onConfigurePin_: function() {
175 this.currentRoute = { 176 this.currentRoute = {
176 page: 'basic', 177 page: 'basic',
177 section: 'people', 178 section: 'people',
178 subpage: [QuickUnlockScreen.CHOOSE_METHOD, QuickUnlockScreen.SETUP_PIN] 179 subpage: [QuickUnlockScreen.CHOOSE_METHOD, QuickUnlockScreen.SETUP_PIN]
179 }; 180 };
180 }, 181 },
181 }); 182 });
182 183
183 })(); 184 })();
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/quick_unlock_setup_pin.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698