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

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

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.html
diff --git a/chrome/browser/resources/settings/people_page/lock_screen.html b/chrome/browser/resources/settings/people_page/lock_screen.html
index 63188550791108426e157e8b53dbb6fe9795fce9..0fc81b07101babf3fb06cdd7e5097671bf5e7313 100644
--- a/chrome/browser/resources/settings/people_page/lock_screen.html
+++ b/chrome/browser/resources/settings/people_page/lock_screen.html
@@ -25,10 +25,10 @@
<div class="list-frame">
<paper-radio-group selected="{{selectedUnlockType}}">
<paper-radio-button name="password">
- $i18n{lockScreenPasswordOnly}
+ [[i18n('lockScreenPasswordOnly')]]
jdufault 2016/08/11 18:34:10 Please add a TODO to revert these changes once we
xiaoyinh(OOO Sep 11-29) 2016/08/11 23:59:51 Done.
</paper-radio-button>
<paper-radio-button name="pin+password">
- $i18n{lockScreenPinOrPassword}
+ [[i18n('lockScreenPinOrPassword')]]
</paper-radio-button>
<div class="settings-box continuation radio-indent"
hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
@@ -41,7 +41,7 @@
<div class="settings-box single-column">
jdufault 2016/08/11 18:34:10 Should the hidden$ be on this div instead?
xiaoyinh(OOO Sep 11-29) 2016/08/11 23:59:51 Thanks Jacob. I could move it here. One thing is i
jdufault 2016/08/12 21:45:35 Okay, feel free to leave it wherever it visually l
xiaoyinh(OOO Sep 11-29) 2016/08/16 17:33:43 Done.
<settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
- label="$i18n{enableScreenlock}">
+ label="$i18n{enableScreenlock}" hidden$="[[hideEnableSettings_()]]">
jdufault 2016/08/11 18:34:10 You can use the property directly instead of creat
jdufault 2016/08/11 18:34:10 nit: newline instead of wrapping
xiaoyinh(OOO Sep 11-29) 2016/08/11 23:59:50 Done.
xiaoyinh(OOO Sep 11-29) 2016/08/11 23:59:51 Done.
</settings-checkbox>
</div>

Powered by Google App Engine
This is Rietveld 408576698