Index: chrome/browser/resources/settings/people_page/people_page.js |
diff --git a/chrome/browser/resources/settings/people_page/people_page.js b/chrome/browser/resources/settings/people_page/people_page.js |
index 3f7cef10cb9d64d07174e783d7c67744676e776d..448caff5664b73e709d51ee34b51e58185815411 100644 |
--- a/chrome/browser/resources/settings/people_page/people_page.js |
+++ b/chrome/browser/resources/settings/people_page/people_page.js |
@@ -10,7 +10,11 @@ Polymer({ |
is: 'settings-people-page', |
behaviors: [ |
+ I18nBehavior, |
WebUIListenerBehavior, |
+<if expr="chromeos"> |
+ LockStateBehavior, |
+</if> |
], |
properties: { |
@@ -143,6 +147,17 @@ Polymer({ |
</if> |
}, |
+<if expr="chromeos"> |
+ /** @private */ |
+ getPasswordState_: function(hasPin, enableScreenLock) { |
+ if (!enableScreenLock) |
+ return this.i18n('lockScreenNone'); |
+ if (hasPin) |
+ return this.i18n('lockScreenPinOrPassword'); |
+ return this.i18n('lockScreenPasswordOnly'); |
+ }, |
+</if> |
+ |
/** |
* Handler for when the profile's icon and name is updated. |
* @private |
@@ -240,8 +255,8 @@ Polymer({ |
<if expr="chromeos"> |
/** @private */ |
- onQuickUnlockTap_: function() { |
- settings.navigateTo(settings.Route.QUICK_UNLOCK_AUTHENTICATE); |
+ onLockTap_: function() { |
+ settings.navigateTo(settings.Route.LOCK_SCREEN); |
}, |
/** @private */ |