| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.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/icon.html"> | 3 <link rel="import" href="chrome://resources/html/icon.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 <div class="settings-box single-column"> | 184 <div class="settings-box single-column"> |
| 185 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 185 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 186 label="$i18n{enableScreenlock}"> | 186 label="$i18n{enableScreenlock}"> |
| 187 </settings-checkbox> | 187 </settings-checkbox> |
| 188 </div> | 188 </div> |
| 189 </template> | 189 </template> |
| 190 | 190 |
| 191 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 191 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
| 192 <div class="settings-box two-line" actionable | 192 <div class="settings-box two-line" actionable |
| 193 on-tap="onConfigureLockTap_"> | 193 on-tap="onConfigureLockTap_"> |
| 194 <div class="middle"> | 194 <div class="start"> |
| 195 <div>$i18n{lockScreenTitle}</div> | 195 $i18n{lockScreenTitle} |
| 196 <div class="secondary"> | 196 <div class="secondary"> |
| 197 [[getPasswordState_(hasPin, | 197 [[getPasswordState_(hasPin, |
| 198 prefs.settings.enable_screen_lock.value)]] | 198 prefs.settings.enable_screen_lock.value)]] |
| 199 </div> | 199 </div> |
| 200 </div> | 200 </div> |
| 201 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 201 </div> | 202 </div> |
| 202 </template> | 203 </template> |
| 203 | 204 |
| 204 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 205 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| 205 <div class="settings-box"> | 206 <div class="settings-box"> |
| 206 <div class="middle"> | 207 <div class="middle"> |
| 207 <div>$i18n{easyUnlockSectionTitle}</div> | 208 <div>$i18n{easyUnlockSectionTitle}</div> |
| 208 <div class="secondary"> | 209 <div class="secondary"> |
| 209 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 210 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
| 210 $i18n{easyUnlockSetupIntro} | 211 $i18n{easyUnlockSetupIntro} |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 | 344 |
| 344 <if expr="chromeos"> | 345 <if expr="chromeos"> |
| 345 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 346 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 346 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 347 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 347 </easy-unlock-turn-off-dialog> | 348 </easy-unlock-turn-off-dialog> |
| 348 </template> | 349 </template> |
| 349 </if> | 350 </if> |
| 350 </template> | 351 </template> |
| 351 <script src="people_page.js"></script> | 352 <script src="people_page.js"></script> |
| 352 </dom-module> | 353 </dom-module> |
| OLD | NEW |