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

Unified Diff: chrome/browser/resources/settings/people_page/people_page.js

Issue 2208473007: Rework quick unlock settings to follow new specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fix closure (bad merge) Created 4 years, 4 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
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 cc6dcc10c977e77139d6c55952fef60d30be7df2..da7961a3529deb418d5bf444cc81cf6f6818861d 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: {
@@ -135,6 +139,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
@@ -232,8 +247,8 @@ Polymer({
<if expr="chromeos">
/** @private */
- onQuickUnlockTap_: function() {
- settings.navigateTo(settings.Route.QUICK_UNLOCK_AUTHENTICATE);
+ onConfigureLockTap_: function() {
+ settings.navigateTo(settings.Route.LOCK_SCREEN);
},
/** @private */

Powered by Google App Engine
This is Rietveld 408576698