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 /** | 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 Loading... | |
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( |
96 settings.Route.LOCK_SCREEN); | 96 settings.getCurrentRoute(), settings.getCurrentRoute()); |
Dan Beam
2017/02/23 06:33:51
rather than just calling currentRouteChanged(), ca
xiaoyinh(OOO Sep 11-29)
2017/02/23 21:11:09
Done.
| |
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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
195 e.preventDefault(); | 195 e.preventDefault(); |
196 this.$.setupPin.open(); | 196 this.$.setupPin.open(); |
197 this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD); | 197 this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD); |
198 }, | 198 }, |
199 | 199 |
200 /** @private */ | 200 /** @private */ |
201 onEditFingerprints_: function() { | 201 onEditFingerprints_: function() { |
202 settings.navigateTo(settings.Route.FINGERPRINT); | 202 settings.navigateTo(settings.Route.FINGERPRINT); |
203 }, | 203 }, |
204 }); | 204 }); |
OLD | NEW |