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

Side by Side 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
4 <link rel="import" href="/people_page/lock_state_behavior.html"> 4 <link rel="import" href="/people_page/lock_state_behavior.html">
5 <link rel="import" href="/people_page/password_prompt_dialog.html"> 5 <link rel="import" href="/people_page/password_prompt_dialog.html">
6 <link rel="import" href="/people_page/setup_pin_dialog.html"> 6 <link rel="import" href="/people_page/setup_pin_dialog.html">
7 <link rel="import" href="/prefs/prefs_behavior.html"> 7 <link rel="import" href="/prefs/prefs_behavior.html">
8 <link rel="import" href="/route.html"> 8 <link rel="import" href="/route.html">
9 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
10 10
11 <dom-module id="settings-lock-screen"> 11 <dom-module id="settings-lock-screen">
12 <template> 12 <template>
13 <style include="settings-shared"></style> 13 <style include="settings-shared"></style>
14 <style> 14 <style>
15 .radio-indent { 15 .radio-indent {
16 margin-left: 28px; 16 margin-left: 28px;
17 } 17 }
18 <!-- TODO(xiaoyinh@): Remove the hidden style once we
19 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
20 .radio-indent[hidden] {
21 display: none;
22 }
23
24 .settings-checkbox[hidden] {
25 display: none;
26 }
18 27
19 paper-button { 28 paper-button {
20 text-transform: none; 29 text-transform: none;
21 } 30 }
22 </style> 31 </style>
23 32
24 <div> 33 <div>
34 <!--TODO(xiaoyinh@): Use this format $i18n{lockScreenPasswordOnly} once
35 we don't need to support options -->
25 <div class="list-frame"> 36 <div class="list-frame">
26 <paper-radio-group selected="{{selectedUnlockType}}"> 37 <paper-radio-group selected="{{selectedUnlockType}}">
27 <paper-radio-button name="password"> 38 <paper-radio-button name="password">
28 $i18n{lockScreenPasswordOnly} 39 [[i18n('lockScreenPasswordOnly')]]
29 </paper-radio-button> 40 </paper-radio-button>
30 <paper-radio-button name="pin+password"> 41 <paper-radio-button name="pin+password">
31 $i18n{lockScreenPinOrPassword} 42 [[i18n('lockScreenPinOrPassword')]]
32 </paper-radio-button> 43 </paper-radio-button>
33 <div class="settings-box continuation radio-indent" 44 <div class="settings-box continuation radio-indent"
34 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> 45 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
35 <paper-button is="action-link" on-tap="onConfigurePin_"> 46 <paper-button is="action-link" on-tap="onConfigurePin_">
36 [[getSetupPinText_(hasPin)]] 47 [[getSetupPinText_(hasPin)]]
37 </paper-button> 48 </paper-button>
38 </div> 49 </div>
39 </paper-radio-group> 50 </paper-radio-group>
40 </div> 51 </div>
41 52
42 <div class="settings-box single-column"> 53 <div class="settings-box single-column">
43 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" 54 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}"
44 label="$i18n{enableScreenlock}"> 55 label="$i18n{enableScreenlock}" hidden$="[[hideEnable Screenlock]]">
45 </settings-checkbox> 56 </settings-checkbox>
46 </div> 57 </div>
47 58
48 <settings-password-prompt-dialog id="passwordPrompt" 59 <settings-password-prompt-dialog id="passwordPrompt"
49 on-close="onPasswordClosed_" 60 on-close="onPasswordClosed_"
50 set-modes="{{setModes_}}"> 61 set-modes="{{setModes_}}">
51 </settings-password-prompt-dialog> 62 </settings-password-prompt-dialog>
52 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" 63 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
53 set-modes="[[setModes_]]"> 64 set-modes="[[setModes_]]">
54 </settings-setup-pin-dialog> 65 </settings-setup-pin-dialog>
55 </div> 66 </div>
56 </template> 67 </template>
57 68
58 <script src="lock_screen.js"></script> 69 <script src="lock_screen.js"></script>
59 </dom-module> 70 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698