| 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/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"> |
| 11 <link rel="import" href="/people_page/sync_browser_proxy.html"> | 11 <link rel="import" href="/people_page/sync_browser_proxy.html"> |
| 12 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 12 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 13 <link rel="import" href="/settings_page/settings_subpage.html"> | 13 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 14 <link rel="import" href="/settings_shared_css.html"> | 14 <link rel="import" href="/settings_shared_css.html"> |
| 15 | 15 |
| 16 <if expr="chromeos"> | 16 <if expr="chromeos"> |
| 17 <link rel="import" href="/people_page/change_picture.html"> | 17 <link rel="import" href="/people_page/change_picture.html"> |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 <template is="dom-if" if="[[!syncStatus.signedIn]]"> | 92 <template is="dom-if" if="[[!syncStatus.signedIn]]"> |
| 93 <span class="secondary-action"> | 93 <span class="secondary-action"> |
| 94 <paper-button class="primary-button" on-tap="onSigninTap_" | 94 <paper-button class="primary-button" on-tap="onSigninTap_" |
| 95 disabled="[[syncStatus.setupInProgress]]"> | 95 disabled="[[syncStatus.setupInProgress]]"> |
| 96 $i18n{syncSignin} | 96 $i18n{syncSignin} |
| 97 </paper-button> | 97 </paper-button> |
| 98 </span> | 98 </span> |
| 99 </template> | 99 </template> |
| 100 <template is="dom-if" if="[[syncStatus.signedIn]]"> | 100 <template is="dom-if" if="[[syncStatus.signedIn]]"> |
| 101 <span class="secondary-action"> | 101 <span class="secondary-action"> |
| 102 <paper-button class="secondary-button" on-tap="onDisconnectTap_" | 102 <paper-button id="disconnectButton" class="secondary-button" |
| 103 on-tap="onDisconnectTap_" |
| 103 disabled="[[syncStatus.setupInProgress]]"> | 104 disabled="[[syncStatus.setupInProgress]]"> |
| 104 $i18n{syncDisconnect} | 105 $i18n{syncDisconnect} |
| 105 </paper-button> | 106 </paper-button> |
| 106 </span> | 107 </span> |
| 107 </template> | 108 </template> |
| 108 </if> | 109 </if> |
| 109 </div> | 110 </div> |
| 110 <div class="settings-box two-line" hidden="[[syncStatus.signedIn]]"> | 111 <div class="settings-box two-line" hidden="[[syncStatus.signedIn]]"> |
| 111 $i18n{syncOverview} | 112 $i18n{syncOverview} |
| 112 </div> | 113 </div> |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 <template is="dom-if" name="manageProfile"> | 253 <template is="dom-if" name="manageProfile"> |
| 253 <settings-subpage page-title="$i18n{editPerson}"> | 254 <settings-subpage page-title="$i18n{editPerson}"> |
| 254 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" | 255 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" |
| 255 profile-name="[[profileName_]]"> | 256 profile-name="[[profileName_]]"> |
| 256 </settings-manage-profile> | 257 </settings-manage-profile> |
| 257 </settings-subpage> | 258 </settings-subpage> |
| 258 </template> | 259 </template> |
| 259 </if> | 260 </if> |
| 260 </settings-animated-pages> | 261 </settings-animated-pages> |
| 261 | 262 |
| 262 <paper-dialog modal id="disconnectDialog"> | 263 <cr-dialog id="disconnectDialog"> |
| 263 <h2>$i18n{syncDisconnectTitle}</h2> | 264 <div class="title">$i18n{syncDisconnectTitle}</div> |
| 264 <div>$i18nRaw{syncDisconnectExplanation}</div> | 265 <div class="body"> |
| 265 <if expr="(not chromeos and is_posix) or is_win or is_macosx"> | 266 <div inner-h-t-m-l="[[getDisconnectExplanationHtml_(syncStatus.domain)]]
"> |
| 266 <paper-checkbox id="deleteProfile"> | 267 </div> |
| 267 $i18n{syncDisconnectDeleteProfile} | 268 <if expr="(not chromeos and is_posix) or is_win or is_macosx"> |
| 268 </paper-checkbox> | 269 <paper-checkbox id="deleteProfile" hidden=[[syncStatus.domain]]> |
| 269 </if> | 270 $i18n{syncDisconnectDeleteProfile} |
| 270 <div class="button-strip"> | 271 </paper-checkbox> |
| 271 <paper-button dialog-dismiss>$i18n{cancel}</paper-button> | 272 </if> |
| 272 <paper-button dialog-confirm class="action-button" | 273 </div> |
| 273 on-tap="onDisconnectConfirm_"> | 274 <div class="button-container"> |
| 275 <paper-button on-tap="onDisconnectCancel_">$i18n{cancel}</paper-button> |
| 276 <paper-button id="disconnectConfirm" class="action-button" |
| 277 hidden=[[syncStatus.domain]] on-tap="onDisconnectConfirm_"> |
| 278 $i18n{syncDisconnect} |
| 279 </paper-button> |
| 280 <paper-button id="disconnectManagedProfileConfirm" class="action-button" |
| 281 hidden=[[!syncStatus.domain]] on-tap="onDisconnectConfirm_"> |
| 274 $i18n{syncDisconnectConfirm} | 282 $i18n{syncDisconnectConfirm} |
| 275 </paper-button> | 283 </paper-button> |
| 276 </div> | 284 </div> |
| 277 </paper-dialog> | 285 </cr-dialog> |
| 278 | 286 |
| 279 <if expr="chromeos"> | 287 <if expr="chromeos"> |
| 280 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 288 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 281 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 289 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 282 </easy-unlock-turn-off-dialog> | 290 </easy-unlock-turn-off-dialog> |
| 283 </template> | 291 </template> |
| 284 </if> | 292 </if> |
| 285 </template> | 293 </template> |
| 286 <script src="people_page.js"></script> | 294 <script src="people_page.js"></script> |
| 287 </dom-module> | 295 </dom-module> |
| OLD | NEW |