Chromium Code Reviews| 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/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.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/neon-animation/neon-ani matable.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html"> |
| 8 <link rel="import" href="/controls/settings_checkbox.html"> | 8 <link rel="import" href="/controls/settings_checkbox.html"> |
| 9 <link rel="import" href="/people_page/sync_page.html"> | 9 <link rel="import" href="/people_page/sync_page.html"> |
| 10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> | 10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 155 </div> | 155 </div> |
| 156 </div> | 156 </div> |
| 157 | 157 |
| 158 <if expr="chromeos"> | 158 <if expr="chromeos"> |
| 159 <!-- TODO(jdufault): Confirm if this goes above or below easy unlock | 159 <!-- TODO(jdufault): Confirm if this goes above or below easy unlock |
| 160 settings. --> | 160 settings. --> |
| 161 <template is="dom-if" if=[[pinUnlockAllowed_]]> | 161 <template is="dom-if" if=[[pinUnlockAllowed_]]> |
| 162 <div class="settings-box"> | 162 <div class="settings-box"> |
| 163 <!-- TODO(jdufault): i18n --> | 163 <!-- TODO(jdufault): i18n --> |
| 164 <p>Quick Unlock PIN</p> | 164 <p>Quick Unlock PIN</p> |
| 165 <pin-keyboard></pin-keyboard> | 165 <pin-keyboard placeholder="$i18n{pinKeyboardPlaceholderPin}"> |
|
jdufault
2016/06/28 23:06:10
Drop this change; placeholder should be driven by
sammiequon
2016/06/29 19:44:08
Done.
| |
| 166 </pin-keyboard> | |
| 166 </div> | 167 </div> |
| 167 </template> | 168 </template> |
| 168 | 169 |
| 169 <div class="settings-box"> | 170 <div class="settings-box"> |
| 170 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 171 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 171 label="$i18n{enableScreenlock}"> | 172 label="$i18n{enableScreenlock}"> |
| 172 </settings-checkbox> | 173 </settings-checkbox> |
| 173 </div> | 174 </div> |
| 174 | 175 |
| 175 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 176 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 278 | 279 |
| 279 <if expr="chromeos"> | 280 <if expr="chromeos"> |
| 280 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 281 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 281 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 282 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 282 </easy-unlock-turn-off-dialog> | 283 </easy-unlock-turn-off-dialog> |
| 283 </template> | 284 </template> |
| 284 </if> | 285 </if> |
| 285 </template> | 286 </template> |
| 286 <script src="people_page.js"></script> | 287 <script src="people_page.js"></script> |
| 287 </dom-module> | 288 </dom-module> |
| OLD | NEW |