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

Side by Side Diff: chrome/browser/resources/settings/people_page/people_page.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/cr_elements/cr_dialog/cr_dialog.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 3 <link rel="import" href="chrome://resources/cr_elements/icons.html">
4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
5 <link rel="import" href="chrome://resources/html/icon.html"> 5 <link rel="import" href="chrome://resources/html/icon.html">
6 <link rel="import" href="chrome://resources/html/polymer.html"> 6 <link rel="import" href="chrome://resources/html/polymer.html">
7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
13 <link rel="import" href="/controls/settings_checkbox.html"> 13 <link rel="import" href="/controls/settings_toggle_button.html">
14 <link rel="import" href="/people_page/sync_page.html"> 14 <link rel="import" href="/people_page/sync_page.html">
15 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> 15 <link rel="import" href="/people_page/profile_info_browser_proxy.html">
16 <link rel="import" href="/people_page/sync_browser_proxy.html"> 16 <link rel="import" href="/people_page/sync_browser_proxy.html">
17 <link rel="import" href="/route.html"> 17 <link rel="import" href="/route.html">
18 <link rel="import" href="/settings_page/settings_animated_pages.html"> 18 <link rel="import" href="/settings_page/settings_animated_pages.html">
19 <link rel="import" href="/settings_page/settings_subpage.html"> 19 <link rel="import" href="/settings_page/settings_subpage.html">
20 <link rel="import" href="/settings_shared_css.html"> 20 <link rel="import" href="/settings_shared_css.html">
21 21
22 <if expr="chromeos"> 22 <if expr="chromeos">
23 <link rel="import" href="/people_page/change_picture.html"> 23 <link rel="import" href="/people_page/change_picture.html">
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 </div> 193 </div>
194 <div class="middle"> 194 <div class="middle">
195 <div>$i18n{personalizeGoogleServicesTitle}</div> 195 <div>$i18n{personalizeGoogleServicesTitle}</div>
196 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> 196 <div class="secondary">$i18n{personalizeGoogleServicesText}</div>
197 </div> 197 </div>
198 <button class="icon-external" is="paper-icon-button-light"></button> 198 <button class="icon-external" is="paper-icon-button-light"></button>
199 </div> 199 </div>
200 200
201 <if expr="chromeos"> 201 <if expr="chromeos">
202 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> 202 <template is="dom-if" if="[[!quickUnlockEnabled_]]">
203 <div class="settings-box single-column"> 203 <div class="settings-box">
204 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" 204 <settings-toggle-button class="start"
205 pref="{{prefs.settings.enable_screen_lock}}"
205 label="$i18n{enableScreenlock}"> 206 label="$i18n{enableScreenlock}">
206 </settings-checkbox> 207 </settings-toggle-button>
207 </div> 208 </div>
208 </template> 209 </template>
209 210
210 <template is="dom-if" if="[[quickUnlockEnabled_]]"> 211 <template is="dom-if" if="[[quickUnlockEnabled_]]">
211 <div class="settings-box two-line" actionable 212 <div class="settings-box two-line" actionable
212 on-tap="onConfigureLockTap_"> 213 on-tap="onConfigureLockTap_">
213 <div class="start"> 214 <div class="start">
214 $i18n{lockScreenTitle} 215 $i18n{lockScreenTitle}
215 <div class="secondary"> 216 <div class="secondary">
216 [[getPasswordState_(hasPin, 217 [[getPasswordState_(hasPin,
(...skipping 11 matching lines...) Expand all
228 <div class="secondary"> 229 <div class="secondary">
229 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> 230 <template is="dom-if" if="[[!easyUnlockEnabled_]]">
230 $i18n{easyUnlockSetupIntro} 231 $i18n{easyUnlockSetupIntro}
231 </template> 232 </template>
232 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 233 <template is="dom-if" if="[[easyUnlockEnabled_]]">
233 $i18n{easyUnlockDescription} 234 $i18n{easyUnlockDescription}
234 </template> 235 </template>
235 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}"> 236 <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}">
236 $i18n{learnMore} 237 $i18n{learnMore}
237 </a> 238 </a>
239 <!-- TODO(dbeam): this should be 1 dom-if with a method instead
240 of 2 nested dom-ifs. -->
238 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 241 <template is="dom-if" if="[[easyUnlockEnabled_]]">
239 <template is="dom-if" 242 <template is="dom-if"
240 if="[[easyUnlockProximityDetectionAllowed_]]"> 243 if="[[easyUnlockProximityDetectionAllowed_]]">
241 <settings-checkbox 244 <settings-toggle-button
242 pref="{{prefs.easy_unlock.proximity_required}}" 245 pref="{{prefs.easy_unlock.proximity_required}}"
243 label="$i18n{easyUnlockRequireProximityLabel}"> 246 label="$i18n{easyUnlockRequireProximityLabel}">
244 </settings-checkbox> 247 </settings-toggle-button>
245 </template> 248 </template>
246 </template> 249 </template>
247 </div> 250 </div>
248 </div> 251 </div>
249 <div class="secondary-action"> 252 <div class="secondary-action">
250 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> 253 <template is="dom-if" if="[[!easyUnlockEnabled_]]">
251 <paper-button id="easyUnlockSetup" class="secondary-button" 254 <paper-button id="easyUnlockSetup" class="secondary-button"
252 on-tap="onEasyUnlockSetupTap_"> 255 on-tap="onEasyUnlockSetupTap_">
253 $i18n{easyUnlockSetupButton} 256 $i18n{easyUnlockSetupButton}
254 </paper-button> 257 </paper-button>
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 <if expr="chromeos"> 389 <if expr="chromeos">
387 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> 390 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]">
388 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" 391 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"
389 on-close="onEasyUnlockTurnOffDialogClose_"> 392 on-close="onEasyUnlockTurnOffDialogClose_">
390 </easy-unlock-turn-off-dialog> 393 </easy-unlock-turn-off-dialog>
391 </template> 394 </template>
392 </if> 395 </if>
393 </template> 396 </template>
394 <script src="people_page.js"></script> 397 <script src="people_page.js"></script>
395 </dom-module> 398 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698