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

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

Issue 2691943005: fix quick unlock config in options (Closed)
Patch Set: Incorporate comments Created 3 years, 10 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
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-lock-screen' allows the user to change how they unlock their 7 * 'settings-lock-screen' allows the user to change how they unlock their
8 * device. 8 * device.
9 * 9 *
10 * Example: 10 * Example:
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 browserProxy_: null, 85 browserProxy_: null,
86 86
87 /** selectedUnlockType is defined in LockStateBehavior. */ 87 /** selectedUnlockType is defined in LockStateBehavior. */
88 observers: ['selectedUnlockTypeChanged_(selectedUnlockType)'], 88 observers: ['selectedUnlockTypeChanged_(selectedUnlockType)'],
89 89
90 /** @override */ 90 /** @override */
91 attached: function() { 91 attached: function() {
92 // currentRouteChanged is not called during the initial navigation. If the 92 // currentRouteChanged is not called during the initial navigation. If the
93 // user navigates directly to the lockScreen page, we still want to show the 93 // user navigates directly to the lockScreen page, we still want to show the
94 // password prompt page. 94 // password prompt page.
95 this.currentRouteChanged(settings.Route.LOCK_SCREEN, 95 this.currentRouteChanged(settings.getCurrentRoute(),
96 settings.Route.LOCK_SCREEN); 96 settings.getCurrentRoute());
Dan Beam 2017/02/17 02:45:17 say whattttt?
xiaoyinh(OOO Sep 11-29) 2017/02/17 19:33:46 I'm not sure why we want to explicitly set the rou
97 this.browserProxy_ = settings.FingerprintBrowserProxyImpl.getInstance(); 97 this.browserProxy_ = settings.FingerprintBrowserProxyImpl.getInstance();
98 }, 98 },
99 99
100 /** 100 /**
101 * Overridden from settings.RouteObserverBehavior. 101 * Overridden from settings.RouteObserverBehavior.
102 * @param {!settings.Route} newRoute 102 * @param {!settings.Route} newRoute
103 * @param {!settings.Route} oldRoute 103 * @param {!settings.Route} oldRoute
104 * @protected 104 * @protected
105 */ 105 */
106 currentRouteChanged: function(newRoute, oldRoute) { 106 currentRouteChanged: function(newRoute, oldRoute) {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 e.preventDefault(); 193 e.preventDefault();
194 this.$.setupPin.open(); 194 this.$.setupPin.open();
195 this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD); 195 this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD);
196 }, 196 },
197 197
198 /** @private */ 198 /** @private */
199 onEditFingerprints_: function() { 199 onEditFingerprints_: function() {
200 settings.navigateTo(settings.Route.FINGERPRINT); 200 settings.navigateTo(settings.Route.FINGERPRINT);
201 }, 201 },
202 }); 202 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698