| 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/cr_elements/cr_dialog/cr_dialog.html
"> | 9 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 10 <link rel="import" href="/controls/settings_checkbox.html"> | 10 <link rel="import" href="/controls/settings_checkbox.html"> |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 [[profileName_]] | 88 [[profileName_]] |
| 89 </span> | 89 </span> |
| 90 </if> | 90 </if> |
| 91 <if expr="chromeos"> | 91 <if expr="chromeos"> |
| 92 <span id="profile-name"> | 92 <span id="profile-name"> |
| 93 [[profileName_]] | 93 [[profileName_]] |
| 94 </span> | 94 </span> |
| 95 </if> | 95 </if> |
| 96 </div> | 96 </div> |
| 97 <if expr="not chromeos"> | 97 <if expr="not chromeos"> |
| 98 <template is="dom-if" if="[[!syncStatus.signedIn]]"> | 98 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> |
| 99 <span class="secondary-action"> | 99 <span class="secondary-action"> |
| 100 <paper-button class="primary-button" on-tap="onSigninTap_" | 100 <paper-button class="primary-button" on-tap="onSigninTap_" |
| 101 disabled="[[syncStatus.setupInProgress]]"> | 101 disabled="[[syncStatus.setupInProgress]]"> |
| 102 $i18n{syncSignin} | 102 $i18n{syncSignin} |
| 103 </paper-button> | 103 </paper-button> |
| 104 </span> | 104 </span> |
| 105 </template> | 105 </template> |
| 106 <template is="dom-if" if="[[syncStatus.signedIn]]"> | 106 <template is="dom-if" if="[[syncStatus.signedIn]]"> |
| 107 <span class="secondary-action"> | 107 <span class="secondary-action"> |
| 108 <paper-button id="disconnectButton" class="secondary-button" | 108 <paper-button id="disconnectButton" class="secondary-button" |
| 109 on-tap="onDisconnectTap_" | 109 on-tap="onDisconnectTap_" |
| 110 disabled="[[syncStatus.setupInProgress]]"> | 110 disabled="[[syncStatus.setupInProgress]]"> |
| 111 $i18n{syncDisconnect} | 111 $i18n{syncDisconnect} |
| 112 </paper-button> | 112 </paper-button> |
| 113 </span> | 113 </span> |
| 114 </template> | 114 </template> |
| 115 </if> | 115 </if> |
| 116 </div> | 116 </div> |
| 117 <div class="settings-box two-line" hidden="[[syncStatus.signedIn]]"> | 117 <div class="settings-box two-line" |
| 118 hidden="[[!showSignin_(syncStatus)]]"> |
| 118 $i18n{syncOverview} | 119 $i18n{syncOverview} |
| 119 </div> | 120 </div> |
| 120 | 121 |
| 121 <if expr="not chromeos"> | 122 <if expr="not chromeos"> |
| 122 <template is="dom-if" if="[[syncStatus.domain]]"> | 123 <template is="dom-if" if="[[syncStatus.domain]]"> |
| 123 <div class="settings-box"> | 124 <div class="settings-box"> |
| 124 <div class="icon-container"> | 125 <div class="icon-container"> |
| 125 <iron-icon icon="cr:domain"></iron-icon> | 126 <iron-icon icon="cr:domain"></iron-icon> |
| 126 </div> | 127 </div> |
| 127 <div class="middle" | 128 <div class="middle" |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 | 320 |
| 320 <if expr="chromeos"> | 321 <if expr="chromeos"> |
| 321 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 322 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 322 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 323 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 323 </easy-unlock-turn-off-dialog> | 324 </easy-unlock-turn-off-dialog> |
| 324 </template> | 325 </template> |
| 325 </if> | 326 </if> |
| 326 </template> | 327 </template> |
| 327 <script src="people_page.js"></script> | 328 <script src="people_page.js"></script> |
| 328 </dom-module> | 329 </dom-module> |
| OLD | NEW |