| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 </div> | 89 </div> |
| 90 <if expr="not chromeos"> | 90 <if expr="not chromeos"> |
| 91 <div class="middle two-line" on-tap="onProfileNameTap_" actionable> | 91 <div class="middle two-line" on-tap="onProfileNameTap_" actionable> |
| 92 </if> | 92 </if> |
| 93 <if expr="chromeos"> | 93 <if expr="chromeos"> |
| 94 <div class="middle two-line" on-tap="onPictureTap_" actionable> | 94 <div class="middle two-line" on-tap="onPictureTap_" actionable> |
| 95 </if> | 95 </if> |
| 96 <span class="flex" id="profile-name"> | 96 <span class="flex" id="profile-name"> |
| 97 [[profileName_]] | 97 [[profileName_]] |
| 98 </span> | 98 </span> |
| 99 <button class="icon-arrow-right" is="paper-icon-button-light"> | 99 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 100 </button> | |
| 101 </div> | 100 </div> |
| 102 <if expr="not chromeos"> | 101 <if expr="not chromeos"> |
| 103 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> | 102 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> |
| 104 <span class="secondary-action"> | 103 <span class="secondary-action"> |
| 105 <paper-button class="primary-button" on-tap="onSigninTap_" | 104 <paper-button class="primary-button" on-tap="onSigninTap_" |
| 106 disabled="[[syncStatus.setupInProgress]]"> | 105 disabled="[[syncStatus.setupInProgress]]"> |
| 107 $i18n{syncSignin} | 106 $i18n{syncSignin} |
| 108 </paper-button> | 107 </paper-button> |
| 109 </span> | 108 </span> |
| 110 </template> | 109 </template> |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 <div class="middle"> | 152 <div class="middle"> |
| 154 <div>$i18n{sync}</div> | 153 <div>$i18n{sync}</div> |
| 155 <div class="secondary" hidden="[[syncStatus.hasError]]"> | 154 <div class="secondary" hidden="[[syncStatus.hasError]]"> |
| 156 [[syncStatus.statusText]] | 155 [[syncStatus.statusText]] |
| 157 </div> | 156 </div> |
| 158 <div class="secondary sync-error" | 157 <div class="secondary sync-error" |
| 159 hidden="[[!syncStatus.hasError]]"> | 158 hidden="[[!syncStatus.hasError]]"> |
| 160 [[syncStatus.statusText]] | 159 [[syncStatus.statusText]] |
| 161 </div> | 160 </div> |
| 162 </div> | 161 </div> |
| 163 <button class="icon-arrow-right" is="paper-icon-button-light"> | 162 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 164 </button> | |
| 165 </div> | 163 </div> |
| 166 </template> | 164 </template> |
| 167 | 165 |
| 168 <div class="settings-box two-line" id="activity-controls" | 166 <div class="settings-box two-line" id="activity-controls" |
| 169 on-tap="onActivityControlsTap_" actionable | 167 on-tap="onActivityControlsTap_" actionable |
| 170 hidden="[[!syncStatus.signedIn]]"> | 168 hidden="[[!syncStatus.signedIn]]"> |
| 171 <div class="icon-container"> | 169 <div class="icon-container"> |
| 172 <div id="googleg-logo"></div> | 170 <div id="googleg-logo"></div> |
| 173 </div> | 171 </div> |
| 174 <div class="middle"> | 172 <div class="middle"> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 </template> | 241 </template> |
| 244 </if> | 242 </if> |
| 245 | 243 |
| 246 <div id="manage-other-people-subpage-trigger" | 244 <div id="manage-other-people-subpage-trigger" |
| 247 class="settings-box two-line" on-tap="onManageOtherPeople_" | 245 class="settings-box two-line" on-tap="onManageOtherPeople_" |
| 248 actionable> | 246 actionable> |
| 249 <div class="start"> | 247 <div class="start"> |
| 250 $i18n{manageOtherPeople} | 248 $i18n{manageOtherPeople} |
| 251 <div class="secondary">$i18n{manageOtherPeopleDescription}</div> | 249 <div class="secondary">$i18n{manageOtherPeopleDescription}</div> |
| 252 </div> | 250 </div> |
| 253 <button class="icon-arrow-right" is="paper-icon-button-light"></button
> | 251 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 254 </div> | 252 </div> |
| 255 | 253 |
| 256 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> | 254 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> |
| 257 <div id="manageSupervisedUsersContainer" class="settings-box two-line" | 255 <div id="manageSupervisedUsersContainer" class="settings-box two-line" |
| 258 on-tap="onManageSupervisedUsers_" actionable> | 256 on-tap="onManageSupervisedUsers_" actionable> |
| 259 <div class="start"> | 257 <div class="start"> |
| 260 $i18n{manageSupervisedUsers} | 258 $i18n{manageSupervisedUsers} |
| 261 <div class="secondary"> | 259 <div class="secondary"> |
| 262 $i18n{manageSupervisedUsersDescription} | 260 $i18n{manageSupervisedUsersDescription} |
| 263 </div> | 261 </div> |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 | 339 |
| 342 <if expr="chromeos"> | 340 <if expr="chromeos"> |
| 343 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 341 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 344 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 342 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 345 </easy-unlock-turn-off-dialog> | 343 </easy-unlock-turn-off-dialog> |
| 346 </template> | 344 </template> |
| 347 </if> | 345 </if> |
| 348 </template> | 346 </template> |
| 349 <script src="people_page.js"></script> | 347 <script src="people_page.js"></script> |
| 350 </dom-module> | 348 </dom-module> |
| OLD | NEW |