Chromium Code Reviews| OLD | NEW |
|---|---|
| 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"> |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 219 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> | 219 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> |
| 220 <div class="settings-box"> | 220 <div class="settings-box"> |
| 221 <settings-toggle-button class="start" | 221 <settings-toggle-button class="start" |
| 222 pref="{{prefs.settings.enable_screen_lock}}" | 222 pref="{{prefs.settings.enable_screen_lock}}" |
| 223 label="$i18n{enableScreenlock}"> | 223 label="$i18n{enableScreenlock}"> |
| 224 </settings-toggle-button> | 224 </settings-toggle-button> |
| 225 </div> | 225 </div> |
| 226 </template> | 226 </template> |
| 227 | 227 |
| 228 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 228 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
| 229 <div class="settings-box two-line" actionable | 229 <div id="quick-unlock" class="settings-box two-line" actionable |
| 230 on-tap="onConfigureLockTap_"> | 230 on-tap="onConfigureLockTap_"> |
| 231 <div class="start"> | 231 <div class="start"> |
| 232 $i18n{lockScreenTitle} | 232 $i18n{lockScreenTitle} |
| 233 <div class="secondary" id="lockScreenSecondary"> | 233 <div class="secondary" id="lockScreenSecondary"> |
| 234 [[getPasswordState_(hasPin, | 234 [[getPasswordState_(hasPin, |
| 235 prefs.settings.enable_screen_lock.value)]] | 235 prefs.settings.enable_screen_lock.value)]] |
| 236 </div> | 236 </div> |
| 237 </div> | 237 </div> |
| 238 <button class="subpage-arrow" is="paper-icon-button-light" | 238 <button class="subpage-arrow" is="paper-icon-button-light" |
| 239 aria-label="$i18n{lockScreenTitle}" | 239 aria-label="$i18n{lockScreenTitle}" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 320 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 320 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 321 <settings-subpage | 321 <settings-subpage |
| 322 associated-control="[[$$('#sync-status')]]" | 322 associated-control="[[$$('#sync-status')]]" |
| 323 page-title="$i18n{syncPageTitle}" | 323 page-title="$i18n{syncPageTitle}" |
| 324 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 324 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 325 <settings-sync-page></settings-sync-page> | 325 <settings-sync-page></settings-sync-page> |
| 326 </settings-subpage> | 326 </settings-subpage> |
| 327 </template> | 327 </template> |
| 328 <if expr="chromeos"> | 328 <if expr="chromeos"> |
| 329 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 329 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
| 330 <template is="dom-if" route-path="/lockScreen" no-search> | 330 <template is="dom-if" route-path="/lockScreen" no-search> |
|
dpapad
2017/02/28 23:56:12
Unless you remove no-search here, the associated-c
stevenjb
2017/03/01 00:20:31
Ah, I didn't see that. No reason I can think of fo
| |
| 331 <settings-subpage page-title="$i18n{lockScreenTitle}"> | 331 <settings-subpage associated-control="[[$$('#quick-unlock')]]" |
| 332 page-title="$i18n{lockScreenTitle}"> | |
| 332 <settings-lock-screen | 333 <settings-lock-screen |
| 333 prefs="{{prefs}}"> | 334 prefs="{{prefs}}"> |
| 334 </settings-lock-screen> | 335 </settings-lock-screen> |
| 335 </settings-subpage> | 336 </settings-subpage> |
| 336 </template> | 337 </template> |
| 337 </template> | 338 <template is="dom-if" route-path="/lockScreen/fingerprint"> |
| 338 <template is="dom-if" route-path="/lockScreen/fingerprint"> | 339 <settings-subpage associated-control="[[$$('#quick-unlock')]]" |
| 339 <settings-subpage page-title="$i18n{lockScreenFingerprintTitle}"> | 340 page-title="$i18n{lockScreenFingerprintTitle}"> |
| 340 <settings-fingerprint-list></settings-fingerprint-list> | 341 <settings-fingerprint-list></settings-fingerprint-list> |
| 341 </settings-subpage> | 342 </settings-subpage> |
| 343 </template> | |
| 342 </template> | 344 </template> |
| 343 <template is="dom-if" route-path="/accounts"> | 345 <template is="dom-if" route-path="/accounts"> |
| 344 <settings-subpage | 346 <settings-subpage |
| 345 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" | 347 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" |
| 346 page-title="$i18n{usersPageTitle}"> | 348 page-title="$i18n{usersPageTitle}"> |
| 347 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 349 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
| 348 </settings-subpage> | 350 </settings-subpage> |
| 349 </template> | 351 </template> |
| 350 <template is="dom-if" route-path="/changePicture"> | 352 <template is="dom-if" route-path="/changePicture"> |
| 351 <settings-subpage | 353 <settings-subpage |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 417 <if expr="chromeos"> | 419 <if expr="chromeos"> |
| 418 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 420 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
| 419 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 421 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
| 420 on-close="onEasyUnlockTurnOffDialogClose_"> | 422 on-close="onEasyUnlockTurnOffDialogClose_"> |
| 421 </easy-unlock-turn-off-dialog> | 423 </easy-unlock-turn-off-dialog> |
| 422 </template> | 424 </template> |
| 423 </if> | 425 </if> |
| 424 </template> | 426 </template> |
| 425 <script src="people_page.js"></script> | 427 <script src="people_page.js"></script> |
| 426 </dom-module> | 428 </dom-module> |
| OLD | NEW |