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

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

Issue 2849663002: [MD settings] replace secondary-action with separator (Closed)
Patch Set: merge with master Created 3 years, 7 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/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html">
6 <link rel="import" href="../controls/settings_toggle_button.html"> 6 <link rel="import" href="../controls/settings_toggle_button.html">
7 <link rel="import" href="easy_unlock_browser_proxy.html"> 7 <link rel="import" href="easy_unlock_browser_proxy.html">
8 <link rel="import" href="easy_unlock_turn_off_dialog.html"> 8 <link rel="import" href="easy_unlock_turn_off_dialog.html">
9 <link rel="import" href="fingerprint_browser_proxy.html"> 9 <link rel="import" href="fingerprint_browser_proxy.html">
10 <link rel="import" href="lock_screen_constants.html"> 10 <link rel="import" href="lock_screen_constants.html">
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 </a> 114 </a>
115 <template is="dom-if" if="[[getShowEasyUnlockToggle_( 115 <template is="dom-if" if="[[getShowEasyUnlockToggle_(
116 easyUnlockEnabled_, easyUnlockProximityDetectionAllowed_)]]"> 116 easyUnlockEnabled_, easyUnlockProximityDetectionAllowed_)]]">
117 <settings-toggle-button 117 <settings-toggle-button
118 pref="{{prefs.easy_unlock.proximity_required}}" 118 pref="{{prefs.easy_unlock.proximity_required}}"
119 label="$i18n{easyUnlockRequireProximityLabel}"> 119 label="$i18n{easyUnlockRequireProximityLabel}">
120 </settings-toggle-button> 120 </settings-toggle-button>
121 </template> 121 </template>
122 </div> 122 </div>
123 </div> 123 </div>
124 <div class="secondary-action"> 124 <div class="separator"></div>
125 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> 125 <template is="dom-if" if="[[!easyUnlockEnabled_]]">
126 <paper-button id="easyUnlockSetup" class="secondary-button" 126 <paper-button id="easyUnlockSetup" class="secondary-button"
127 on-tap="onEasyUnlockSetupTap_"> 127 on-tap="onEasyUnlockSetupTap_">
128 $i18n{easyUnlockSetupButton} 128 $i18n{easyUnlockSetupButton}
129 </paper-button> 129 </paper-button>
130 </template> 130 </template>
131 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 131 <template is="dom-if" if="[[easyUnlockEnabled_]]">
132 <paper-button id="easyUnlockTurnOff" class="secondary-button" 132 <paper-button id="easyUnlockTurnOff" class="secondary-button"
133 on-tap="onEasyUnlockTurnOffTap_"> 133 on-tap="onEasyUnlockTurnOffTap_">
134 $i18n{easyUnlockTurnOffButton} 134 $i18n{easyUnlockTurnOffButton}
135 </paper-button> 135 </paper-button>
136 </template> 136 </template>
137 </div>
138 </div> 137 </div>
139 </template> 138 </template>
140 139
141 <settings-password-prompt-dialog id="passwordPrompt" 140 <settings-password-prompt-dialog id="passwordPrompt"
142 on-close="onPasswordClosed_" set-modes="{{setModes_}}"> 141 on-close="onPasswordClosed_" set-modes="{{setModes_}}">
143 </settings-password-prompt-dialog> 142 </settings-password-prompt-dialog>
144 143
145 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" 144 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
146 on-close="onSetupPinClosed_" set-modes="[[setModes_]]"> 145 on-close="onSetupPinClosed_" set-modes="[[setModes_]]">
147 </settings-setup-pin-dialog> 146 </settings-setup-pin-dialog>
148 147
149 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> 148 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]">
150 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" 149 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"
151 on-close="onEasyUnlockTurnOffDialogClose_"> 150 on-close="onEasyUnlockTurnOffDialogClose_">
152 </easy-unlock-turn-off-dialog> 151 </easy-unlock-turn-off-dialog>
153 </template> 152 </template>
154 </div> 153 </div>
155 </template> 154 </template>
156 155
157 <script src="lock_screen.js"></script> 156 <script src="lock_screen.js"></script>
158 </dom-module> 157 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698