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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js
diff --git a/chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js b/chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js
index db0a57993622827f94dbf33c74d096ee2db6ca6b..8f6d3b3b0937f80c552e14dbb6c26400308f4a3a 100644
--- a/chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js
+++ b/chrome/browser/resources/settings/people_page/quick_unlock_choose_method.js
@@ -79,7 +79,8 @@ Polymer({
chrome.quickUnlockPrivate.onActiveModesChanged.addListener(
this.boundOnActiveModesChanged_);
- this.askForPasswordIfUnset();
+ if (this.isScreenActive(QuickUnlockScreen.CHOOSE_METHOD))
+ this.askForPasswordIfUnset();
},
/** @override */
« 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