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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 }, | 76 }, |
77 | 77 |
78 /** selectedUnlockType is defined in LockStateBehavior. */ | 78 /** selectedUnlockType is defined in LockStateBehavior. */ |
79 observers: ['selectedUnlockTypeChanged_(selectedUnlockType)'], | 79 observers: ['selectedUnlockTypeChanged_(selectedUnlockType)'], |
80 | 80 |
81 /** @override */ | 81 /** @override */ |
82 attached: function() { | 82 attached: function() { |
83 // currentRouteChanged is not called during the initial navigation. If the | 83 // currentRouteChanged is not called during the initial navigation. If the |
84 // user navigates directly to the lockScreen page, we still want to show the | 84 // user navigates directly to the lockScreen page, we still want to show the |
85 // password prompt page. | 85 // password prompt page. |
86 this.currentRouteChanged(settings.Route.LOCK_SCREEN, | 86 this.currentRouteChanged(settings.getCurrentRoute(), |
87 settings.Route.LOCK_SCREEN); | 87 settings.getCurrentRoute()); |
88 }, | 88 }, |
89 | 89 |
90 /** | 90 /** |
91 * Overridden from settings.RouteObserverBehavior. | 91 * Overridden from settings.RouteObserverBehavior. |
92 * @param {!settings.Route} newRoute | 92 * @param {!settings.Route} newRoute |
93 * @param {!settings.Route} oldRoute | 93 * @param {!settings.Route} oldRoute |
94 * @protected | 94 * @protected |
95 */ | 95 */ |
96 currentRouteChanged: function(newRoute, oldRoute) { | 96 currentRouteChanged: function(newRoute, oldRoute) { |
97 if (newRoute == settings.Route.LOCK_SCREEN && !this.setModes_) { | 97 if (newRoute == settings.Route.LOCK_SCREEN && !this.setModes_) { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 e.preventDefault(); | 166 e.preventDefault(); |
167 this.$.setupPin.open(); | 167 this.$.setupPin.open(); |
168 this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD); | 168 this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD); |
169 }, | 169 }, |
170 | 170 |
171 /** @private */ | 171 /** @private */ |
172 onEditFingerprints_: function() { | 172 onEditFingerprints_: function() { |
173 settings.navigateTo(settings.Route.FINGERPRINT); | 173 settings.navigateTo(settings.Route.FINGERPRINT); |
174 }, | 174 }, |
175 }); | 175 }); |
OLD | NEW |