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

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: incorporate comments from jdufault@ 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..b049537093fb5918427a8965d5ced8f17b6d0d3e 100644
--- a/chrome/browser/resources/settings/people_page/lock_screen.html
+++ b/chrome/browser/resources/settings/people_page/lock_screen.html
@@ -15,6 +15,15 @@
.radio-indent {
margin-left: 28px;
}
+ <!-- TODO(xiaoyinh@): Remove the hidden style once we
+ don't need to support options -->
tommycli 2016/08/16 21:10:24 Why are these needed for Options? Doesn't hidden m
tommycli 2016/08/17 21:19:58 We should find out why hidden doesn't work in Opti
xiaoyinh(OOO Sep 11-29) 2016/08/18 22:41:12 In settings we have imported chrome://resources/po
+ .radio-indent[hidden] {
+ display: none;
+ }
+
+ .settings-checkbox[hidden] {
+ display: none;
+ }
paper-button {
text-transform: none;
@@ -22,13 +31,15 @@
</style>
<div>
+ <!--TODO(xiaoyinh@): Use this format $i18n{lockScreenPasswordOnly} once
+ we don't need to support options -->
<div class="list-frame">
<paper-radio-group selected="{{selectedUnlockType}}">
<paper-radio-button name="password">
- $i18n{lockScreenPasswordOnly}
+ [[i18n('lockScreenPasswordOnly')]]
</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 +52,7 @@
<div class="settings-box single-column">
<settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
- label="$i18n{enableScreenlock}">
+ label="$i18n{enableScreenlock}" hidden$="[[hideEnableScreenlock]]">
</settings-checkbox>
</div>

Powered by Google App Engine
This is Rietveld 408576698