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

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

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/lock_screen.js
diff --git a/chrome/browser/resources/settings/people_page/lock_screen.js b/chrome/browser/resources/settings/people_page/lock_screen.js
index f296363be34d22c6969668a110d742ddcf0a9617..76470fe77f08e242cc7e3a6d1d2feddf6c50a943 100644
--- a/chrome/browser/resources/settings/people_page/lock_screen.js
+++ b/chrome/browser/resources/settings/people_page/lock_screen.js
@@ -37,6 +37,16 @@ Polymer({
type: Object,
observer: 'onSetModesChanged_'
},
+
+ /**
+ * Hide enable screenlock settings if coming from options page
+ */
jdufault 2016/08/11 18:34:10 Add a TODO to remove this property after options i
xiaoyinh(OOO Sep 11-29) 2016/08/11 23:59:51 Done.
+ hideEnableScreenlock: {
+ type: Boolean,
+ value: false,
+ notify: true
+ },
+
},
/** selectedUnlockType is defined in LockStateBehavior. */
@@ -92,8 +102,10 @@ Polymer({
/** @private */
onPasswordClosed_: function() {
- if (!this.setModes_)
+ if (!this.setModes_) {
+ document.dispatchEvent(new Event('close-overlay'));
jdufault 2016/08/11 18:34:10 Can you make it work by firing an event on the ele
jdufault 2016/08/11 18:34:11 Add a TODO to remove this event after options is g
xiaoyinh(OOO Sep 11-29) 2016/08/11 23:59:51 Done.
xiaoyinh(OOO Sep 11-29) 2016/08/11 23:59:51 Done.
settings.navigateTo(settings.Route.PEOPLE);
+ }
},
/** @private */
@@ -111,6 +123,16 @@ Polymer({
return selectedUnlockType === LockScreenUnlockType.PIN_PASSWORD;
},
+ /**
+ * Retruns true if the settings for enable screenlock should be
+ * hidden, when it is coming from options page
+ * @private
+ * */
+ hideEnableSettings_: function() {
+ return this.hideEnableScreenlock;
+ },
+
+
/** @private */
getSetupPinText_: function() {
if (this.hasPin)

Powered by Google App Engine
This is Rietveld 408576698