Chromium Code Reviews| 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/polymer/v1_0/paper-dialog/paper-dial og.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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 258 <template is="dom-if" name="manageProfile"> | 258 <template is="dom-if" name="manageProfile"> |
| 259 <settings-subpage page-title="$i18n{editPerson}"> | 259 <settings-subpage page-title="$i18n{editPerson}"> |
| 260 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" | 260 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" |
| 261 profile-name="[[profileName_]]"> | 261 profile-name="[[profileName_]]"> |
| 262 </settings-manage-profile> | 262 </settings-manage-profile> |
| 263 </settings-subpage> | 263 </settings-subpage> |
| 264 </template> | 264 </template> |
| 265 </if> | 265 </if> |
| 266 </settings-animated-pages> | 266 </settings-animated-pages> |
| 267 | 267 |
| 268 <paper-dialog modal id="disconnectDialog"> | 268 <paper-dialog modal id="disconnectDialog"> |
|
dpapad
2016/06/28 22:17:22
Unrelated to this CL, but wondering if this should
tommycli
2016/06/28 23:26:00
Done. Yes, it's just old code. I changed it to use
| |
| 269 <h2>$i18n{syncDisconnectTitle}</h2> | 269 <h2>$i18n{syncDisconnectTitle}</h2> |
| 270 <div>$i18nRaw{syncDisconnectExplanation}</div> | 270 <div inner-h-t-m-l="[[getDisconnectExplanationHtml_(syncStatus.domain)]]"> |
| 271 </div> | |
| 271 <if expr="(not chromeos and is_posix) or is_win or is_macosx"> | 272 <if expr="(not chromeos and is_posix) or is_win or is_macosx"> |
| 272 <paper-checkbox id="deleteProfile"> | 273 <paper-checkbox id="deleteProfile" hidden=[[syncStatus.domain]]> |
| 273 $i18n{syncDisconnectDeleteProfile} | 274 $i18n{syncDisconnectDeleteProfile} |
| 274 </paper-checkbox> | 275 </paper-checkbox> |
| 275 </if> | 276 </if> |
| 276 <div class="button-strip"> | 277 <div class="button-strip"> |
| 277 <paper-button dialog-dismiss>$i18n{cancel}</paper-button> | 278 <paper-button dialog-dismiss>$i18n{cancel}</paper-button> |
| 278 <paper-button dialog-confirm class="action-button" | 279 <paper-button dialog-confirm class="action-button" |
| 279 on-tap="onDisconnectConfirm_"> | 280 hidden=[[syncStatus.domain]] on-tap="onDisconnectConfirm_"> |
| 281 $i18n{syncDisconnect} | |
| 282 </paper-button> | |
| 283 <paper-button dialog-confirm class="action-button" | |
| 284 hidden=[[!syncStatus.domain]] on-tap="onDisconnectConfirm_"> | |
| 280 $i18n{syncDisconnectConfirm} | 285 $i18n{syncDisconnectConfirm} |
| 281 </paper-button> | 286 </paper-button> |
| 282 </div> | 287 </div> |
| 283 </paper-dialog> | 288 </paper-dialog> |
| 284 | 289 |
| 285 <if expr="chromeos"> | 290 <if expr="chromeos"> |
| 286 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 291 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 287 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 292 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 288 </easy-unlock-turn-off-dialog> | 293 </easy-unlock-turn-off-dialog> |
| 289 </template> | 294 </template> |
| 290 </if> | 295 </if> |
| 291 </template> | 296 </template> |
| 292 <script src="people_page.js"></script> | 297 <script src="people_page.js"></script> |
| 293 </dom-module> | 298 </dom-module> |
| OLD | NEW |