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

Side by Side Diff: chrome/browser/resources/settings/people_page/lock_screen.html

Issue 2617533003: MD Settings: change most checkboxes to toggles (leave dialogs alone) (Closed)
Patch Set: fix tests Created 3 years, 11 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="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html">
5 <link rel="import" href="/controls/settings_toggle_button.html">
5 <link rel="import" href="/people_page/lock_screen_constants.html"> 6 <link rel="import" href="/people_page/lock_screen_constants.html">
6 <link rel="import" href="/people_page/lock_state_behavior.html"> 7 <link rel="import" href="/people_page/lock_state_behavior.html">
7 <link rel="import" href="/people_page/password_prompt_dialog.html"> 8 <link rel="import" href="/people_page/password_prompt_dialog.html">
8 <link rel="import" href="/people_page/setup_pin_dialog.html"> 9 <link rel="import" href="/people_page/setup_pin_dialog.html">
9 <link rel="import" href="/prefs/prefs_behavior.html"> 10 <link rel="import" href="/prefs/prefs_behavior.html">
10 <link rel="import" href="/route.html"> 11 <link rel="import" href="/route.html">
11 <link rel="import" href="/settings_shared_css.html"> 12 <link rel="import" href="/settings_shared_css.html">
12 13
13 <dom-module id="settings-lock-screen"> 14 <dom-module id="settings-lock-screen">
14 <template> 15 <template>
(...skipping 11 matching lines...) Expand all
26 <div> 27 <div>
27 <div class="list-frame"> 28 <div class="list-frame">
28 <paper-radio-group selected="{{selectedUnlockType}}"> 29 <paper-radio-group selected="{{selectedUnlockType}}">
29 <paper-radio-button name="password"> 30 <paper-radio-button name="password">
30 $i18n{lockScreenPasswordOnly} 31 $i18n{lockScreenPasswordOnly}
31 </paper-radio-button> 32 </paper-radio-button>
32 <paper-radio-button name="pin+password"> 33 <paper-radio-button name="pin+password">
33 $i18n{lockScreenPinOrPassword} 34 $i18n{lockScreenPinOrPassword}
34 </paper-radio-button> 35 </paper-radio-button>
35 <div class="settings-box continuation radio-indent" 36 <div class="settings-box continuation radio-indent"
36 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> 37 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
38 <!-- TODO(dbeam): I seriously doubt paper-button[is=action-link] is
39 a good idea. -->
37 <paper-button is="action-link" on-tap="onConfigurePin_"> 40 <paper-button is="action-link" on-tap="onConfigurePin_">
38 [[getSetupPinText_(hasPin)]] 41 [[getSetupPinText_(hasPin)]]
39 </paper-button> 42 </paper-button>
40 </div> 43 </div>
41 </paper-radio-group> 44 </paper-radio-group>
42 </div> 45 </div>
43 46
44 <div class="settings-box single-column"> 47 <div class="settings-box">
45 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" 48 <settings-toggle-button class="start"
46 label="$i18n{enableScreenlock}"> 49 pref="{{prefs.settings.enable_screen_lock}}"
47 </settings-checkbox> 50 label="$i18n{enableScreenlock}">
51 </settings-toggle-button>
48 </div> 52 </div>
49 53
50 <settings-password-prompt-dialog id="passwordPrompt" 54 <settings-password-prompt-dialog id="passwordPrompt"
51 on-close="onPasswordClosed_" 55 on-close="onPasswordClosed_" set-modes="{{setModes_}}">
52 set-modes="{{setModes_}}">
53 </settings-password-prompt-dialog> 56 </settings-password-prompt-dialog>
54 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" 57 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
55 set-modes="[[setModes_]]"> 58 set-modes="[[setModes_]]">
56 </settings-setup-pin-dialog> 59 </settings-setup-pin-dialog>
57 </div> 60 </div>
58 </template> 61 </template>
59 62
60 <script src="lock_screen.js"></script> 63 <script src="lock_screen.js"></script>
61 </dom-module> 64 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698