| 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/cr_elements/cr_dialog/cr_dialog.html
"> | 7 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 <if expr="chromeos"> | 162 <if expr="chromeos"> |
| 163 <div class="settings-box single-column"> | 163 <div class="settings-box single-column"> |
| 164 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 164 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 165 label="$i18n{enableScreenlock}"> | 165 label="$i18n{enableScreenlock}"> |
| 166 </settings-checkbox> | 166 </settings-checkbox> |
| 167 </div> | 167 </div> |
| 168 | 168 |
| 169 <!-- TODO(jdufault): Disable navigating to /quickUnlock/* if pin is | 169 <!-- TODO(jdufault): Disable navigating to /quickUnlock/* if pin is |
| 170 disabled. --> | 170 disabled. --> |
| 171 <template is="dom-if" if=[[quickUnlockEnabled_]]> | 171 <template is="dom-if" if=[[quickUnlockEnabled_]]> |
| 172 <div id="quick-unlock-subpage-trigger" class="settings-box"> | 172 <div class="settings-box"> |
| 173 <paper-button on-tap="onQuickUnlockTap_" class="primary-button"> | 173 <paper-button on-tap="onQuickUnlockTap_" class="primary-button"> |
| 174 $i18n{quickUnlockTitle} | 174 $i18n{quickUnlockTitle} |
| 175 </paper-button> | 175 </paper-button> |
| 176 </div> | 176 </div> |
| 177 </template> | 177 </template> |
| 178 | 178 |
| 179 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 179 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| 180 <div class="settings-box"> | 180 <div class="settings-box"> |
| 181 <div class="middle"> | 181 <div class="middle"> |
| 182 <div>$i18n{easyUnlockSectionTitle}</div> | 182 <div>$i18n{easyUnlockSectionTitle}</div> |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 </template> | 235 </template> |
| 236 </neon-animatable> | 236 </neon-animatable> |
| 237 <template is="dom-if" name="sync"> | 237 <template is="dom-if" name="sync"> |
| 238 <settings-subpage | 238 <settings-subpage |
| 239 associated-control="[[$$('#customize-sync')]]" | 239 associated-control="[[$$('#customize-sync')]]" |
| 240 page-title="$i18n{syncPageTitle}"> | 240 page-title="$i18n{syncPageTitle}"> |
| 241 <settings-sync-page></settings-sync-page> | 241 <settings-sync-page></settings-sync-page> |
| 242 </settings-subpage> | 242 </settings-subpage> |
| 243 </template> | 243 </template> |
| 244 <if expr="chromeos"> | 244 <if expr="chromeos"> |
| 245 <template is="dom-if" name="quick-unlock-authenticate"> | 245 <template is="dom-if" name="quick-unlock-authenticate" no-search> |
| 246 <settings-subpage | 246 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 247 associated-control="[[$$('#quick-unlock-subpage-trigger')]]" | |
| 248 page-title="$i18n{quickUnlockTitle}"> | |
| 249 <settings-quick-unlock-authenticate | 247 <settings-quick-unlock-authenticate |
| 250 set-modes="{{quickUnlockSetModes}}" | 248 set-modes="{{quickUnlockSetModes}}" |
| 251 profile-name="[[profileName_]]"> | 249 profile-name="[[profileName_]]"> |
| 252 </settings-quick-unlock-authenticate> | 250 </settings-quick-unlock-authenticate> |
| 253 </settings-subpage> | 251 </settings-subpage> |
| 254 </template> | 252 </template> |
| 255 <template is="dom-if" name="quick-unlock-choose-method"> | 253 <template is="dom-if" name="quick-unlock-choose-method" no-search> |
| 256 <settings-subpage no-associated-control | 254 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 257 page-title="$i18n{quickUnlockTitle}"> | |
| 258 <settings-quick-unlock-choose-method | 255 <settings-quick-unlock-choose-method |
| 259 set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}"> | 256 set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}"> |
| 260 </settings-quick-unlock-choose-method> | 257 </settings-quick-unlock-choose-method> |
| 261 </settings-subpage> | 258 </settings-subpage> |
| 262 </template> | 259 </template> |
| 263 <template is="dom-if" name="quick-unlock-setup-pin"> | 260 <template is="dom-if" name="quick-unlock-setup-pin" no-search> |
| 264 <settings-subpage no-associated-control | 261 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 265 page-title="$i18n{quickUnlockTitle}"> | |
| 266 <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]"> | 262 <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]"> |
| 267 </settings-quick-unlock-setup-pin> | 263 </settings-quick-unlock-setup-pin> |
| 268 </settings-subpage> | 264 </settings-subpage> |
| 269 </template> | 265 </template> |
| 270 <template is="dom-if" name="users"> | 266 <template is="dom-if" name="users"> |
| 271 <settings-subpage | 267 <settings-subpage |
| 272 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" | 268 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" |
| 273 page-title="$i18n{usersPageTitle}"> | 269 page-title="$i18n{usersPageTitle}"> |
| 274 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 270 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
| 275 </settings-subpage> | 271 </settings-subpage> |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 | 319 |
| 324 <if expr="chromeos"> | 320 <if expr="chromeos"> |
| 325 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 321 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 326 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 322 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 327 </easy-unlock-turn-off-dialog> | 323 </easy-unlock-turn-off-dialog> |
| 328 </template> | 324 </template> |
| 329 </if> | 325 </if> |
| 330 </template> | 326 </template> |
| 331 <script src="people_page.js"></script> | 327 <script src="people_page.js"></script> |
| 332 </dom-module> | 328 </dom-module> |
| OLD | NEW |