| 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 <div class="middle"> | 153 <div class="middle"> |
| 154 <div>$i18n{sync}</div> | 154 <div>$i18n{sync}</div> |
| 155 <div class="secondary" hidden="[[syncStatus.hasError]]"> | 155 <div class="secondary" hidden="[[syncStatus.hasError]]"> |
| 156 [[syncStatus.statusText]] | 156 [[syncStatus.statusText]] |
| 157 </div> | 157 </div> |
| 158 <div class="secondary sync-error" | 158 <div class="secondary sync-error" |
| 159 hidden="[[!syncStatus.hasError]]"> | 159 hidden="[[!syncStatus.hasError]]"> |
| 160 [[syncStatus.statusText]] | 160 [[syncStatus.statusText]] |
| 161 </div> | 161 </div> |
| 162 </div> | 162 </div> |
| 163 <button class="icon-arrow-right" is="paper-icon-button-light"></butt
on> | 163 <button class="icon-arrow-right" is="paper-icon-button-light"> |
| 164 </button> |
| 164 </div> | 165 </div> |
| 165 </template> | 166 </template> |
| 166 | 167 |
| 167 <div class="settings-box two-line" id="activity-controls" | 168 <div class="settings-box two-line" id="activity-controls" |
| 168 on-tap="onActivityControlsTap_" actionable | 169 on-tap="onActivityControlsTap_" actionable |
| 169 hidden="[[!syncStatus.signedIn]]"> | 170 hidden="[[!syncStatus.signedIn]]"> |
| 170 <div class="icon-container"> | 171 <div class="icon-container"> |
| 171 <div id="googleg-logo"></div> | 172 <div id="googleg-logo"></div> |
| 172 </div> | 173 </div> |
| 173 <div class="middle"> | 174 <div class="middle"> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 </template> | 243 </template> |
| 243 </if> | 244 </if> |
| 244 | 245 |
| 245 <div id="manage-other-people-subpage-trigger" | 246 <div id="manage-other-people-subpage-trigger" |
| 246 class="settings-box two-line" on-tap="onManageOtherPeople_" | 247 class="settings-box two-line" on-tap="onManageOtherPeople_" |
| 247 actionable> | 248 actionable> |
| 248 <div class="start"> | 249 <div class="start"> |
| 249 $i18n{manageOtherPeople} | 250 $i18n{manageOtherPeople} |
| 250 <div class="secondary">$i18n{manageOtherPeopleDescription}</div> | 251 <div class="secondary">$i18n{manageOtherPeopleDescription}</div> |
| 251 </div> | 252 </div> |
| 252 <button class="icon-external" is="paper-icon-button-light"></button> | 253 <button class="icon-arrow-right" is="paper-icon-button-light"></button
> |
| 253 </div> | 254 </div> |
| 254 | 255 |
| 255 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> | 256 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> |
| 256 <div id="manageSupervisedUsersContainer" class="settings-box two-line" | 257 <div id="manageSupervisedUsersContainer" class="settings-box two-line" |
| 257 on-tap="onManageSupervisedUsers_" actionable> | 258 on-tap="onManageSupervisedUsers_" actionable> |
| 258 <div class="start"> | 259 <div class="start"> |
| 259 $i18n{manageSupervisedUsers} | 260 $i18n{manageSupervisedUsers} |
| 260 <div class="secondary"> | 261 <div class="secondary"> |
| 261 $i18n{manageSupervisedUsersDescription} | 262 $i18n{manageSupervisedUsersDescription} |
| 262 </div> | 263 </div> |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 | 341 |
| 341 <if expr="chromeos"> | 342 <if expr="chromeos"> |
| 342 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 343 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 343 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 344 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 344 </easy-unlock-turn-off-dialog> | 345 </easy-unlock-turn-off-dialog> |
| 345 </template> | 346 </template> |
| 346 </if> | 347 </if> |
| 347 </template> | 348 </template> |
| 348 <script src="people_page.js"></script> | 349 <script src="people_page.js"></script> |
| 349 </dom-module> | 350 </dom-module> |
| OLD | NEW |