| 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 | 227 |
| 228 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> | 228 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> |
| 229 <div id="manageSupervisedUsersContainer" class="settings-box"> | 229 <div id="manageSupervisedUsersContainer" class="settings-box"> |
| 230 <paper-button class="primary-button" | 230 <paper-button class="primary-button" |
| 231 on-tap="onManageSupervisedUsers_"> | 231 on-tap="onManageSupervisedUsers_"> |
| 232 $i18n{manageSupervisedUsers} | 232 $i18n{manageSupervisedUsers} |
| 233 </paper-button> | 233 </paper-button> |
| 234 </div> | 234 </div> |
| 235 </template> | 235 </template> |
| 236 </neon-animatable> | 236 </neon-animatable> |
| 237 <template is="dom-if" name="sync"> | 237 <template is="dom-if" name="/syncSetup"> |
| 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" no-search> | 245 <template is="dom-if" name="/quickUnlock/authenticate" no-search> |
| 246 <settings-subpage page-title="$i18n{quickUnlockTitle}"> | 246 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 247 <settings-quick-unlock-authenticate | 247 <settings-quick-unlock-authenticate |
| 248 set-modes="{{quickUnlockSetModes}}" | 248 set-modes="{{quickUnlockSetModes}}" |
| 249 profile-name="[[profileName_]]"> | 249 profile-name="[[profileName_]]"> |
| 250 </settings-quick-unlock-authenticate> | 250 </settings-quick-unlock-authenticate> |
| 251 </settings-subpage> | 251 </settings-subpage> |
| 252 </template> | 252 </template> |
| 253 <template is="dom-if" name="quick-unlock-choose-method" no-search> | 253 <template is="dom-if" name="/quickUnlock/chooseMethod" no-search> |
| 254 <settings-subpage page-title="$i18n{quickUnlockTitle}"> | 254 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 255 <settings-quick-unlock-choose-method | 255 <settings-quick-unlock-choose-method |
| 256 set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}"> | 256 set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}"> |
| 257 </settings-quick-unlock-choose-method> | 257 </settings-quick-unlock-choose-method> |
| 258 </settings-subpage> | 258 </settings-subpage> |
| 259 </template> | 259 </template> |
| 260 <template is="dom-if" name="quick-unlock-setup-pin" no-search> | 260 <template is="dom-if" name="/quickUnlock/setupPin" no-search> |
| 261 <settings-subpage page-title="$i18n{quickUnlockTitle}"> | 261 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 262 <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]"> | 262 <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]"> |
| 263 </settings-quick-unlock-setup-pin> | 263 </settings-quick-unlock-setup-pin> |
| 264 </settings-subpage> | 264 </settings-subpage> |
| 265 </template> | 265 </template> |
| 266 <template is="dom-if" name="users"> | 266 <template is="dom-if" name="/accounts"> |
| 267 <settings-subpage | 267 <settings-subpage |
| 268 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" | 268 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" |
| 269 page-title="$i18n{usersPageTitle}"> | 269 page-title="$i18n{usersPageTitle}"> |
| 270 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 270 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
| 271 </settings-subpage> | 271 </settings-subpage> |
| 272 </template> | 272 </template> |
| 273 <template is="dom-if" name="changePicture"> | 273 <template is="dom-if" name="/changePicture"> |
| 274 <settings-subpage | 274 <settings-subpage |
| 275 associated-control="[[$$('#picture-subpage-trigger')]]" | 275 associated-control="[[$$('#picture-subpage-trigger')]]" |
| 276 page-title="$i18n{changePictureTitle}"> | 276 page-title="$i18n{changePictureTitle}"> |
| 277 <settings-change-picture></settings-change-picture> | 277 <settings-change-picture></settings-change-picture> |
| 278 </settings-subpage> | 278 </settings-subpage> |
| 279 </template> | 279 </template> |
| 280 </if> | 280 </if> |
| 281 <if expr="not chromeos"> | 281 <if expr="not chromeos"> |
| 282 <template is="dom-if" name="manageProfile"> | 282 <template is="dom-if" name="/manageProfile"> |
| 283 <settings-subpage | 283 <settings-subpage |
| 284 associated-control="[[$$('#picture-subpage-trigger')]]" | 284 associated-control="[[$$('#picture-subpage-trigger')]]" |
| 285 page-title="$i18n{editPerson}"> | 285 page-title="$i18n{editPerson}"> |
| 286 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" | 286 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" |
| 287 profile-name="[[profileName_]]"> | 287 profile-name="[[profileName_]]"> |
| 288 </settings-manage-profile> | 288 </settings-manage-profile> |
| 289 </settings-subpage> | 289 </settings-subpage> |
| 290 </template> | 290 </template> |
| 291 </if> | 291 </if> |
| 292 </settings-animated-pages> | 292 </settings-animated-pages> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 319 | 319 |
| 320 <if expr="chromeos"> | 320 <if expr="chromeos"> |
| 321 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 321 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 322 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 322 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 323 </easy-unlock-turn-off-dialog> | 323 </easy-unlock-turn-off-dialog> |
| 324 </template> | 324 </template> |
| 325 </if> | 325 </if> |
| 326 </template> | 326 </template> |
| 327 <script src="people_page.js"></script> | 327 <script src="people_page.js"></script> |
| 328 </dom-module> | 328 </dom-module> |
| OLD | NEW |