| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 3 <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/paper-button/paper-butt
on.html"> | 4 <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-checkbox/paper-ch
eckbox.html"> | 5 <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-dialog/paper-dial
og.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial
og.html"> |
| 7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> | 7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> |
| 8 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> | 8 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> |
| 9 <link rel="import" href="chrome://md-settings/people_page/profile_info_browser_p
roxy.html"> | 9 <link rel="import" href="chrome://md-settings/people_page/profile_info_browser_p
roxy.html"> |
| 10 <link rel="import" href="chrome://md-settings/people_page/sync_browser_proxy.htm
l"> | 10 <link rel="import" href="chrome://md-settings/people_page/sync_browser_proxy.htm
l"> |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 </span> | 72 </span> |
| 73 </if> | 73 </if> |
| 74 <if expr="not chromeos"> | 74 <if expr="not chromeos"> |
| 75 <span id="profile-name"> | 75 <span id="profile-name"> |
| 76 [[profileName_]] | 76 [[profileName_]] |
| 77 </span> | 77 </span> |
| 78 </if> | 78 </if> |
| 79 </div> | 79 </div> |
| 80 <if expr="not chromeos"> | 80 <if expr="not chromeos"> |
| 81 <template is="dom-if" if="[[!syncStatus.signedIn]]"> | 81 <template is="dom-if" if="[[!syncStatus.signedIn]]"> |
| 82 <paper-button class="action-button" on-tap="onSigninTap_" | 82 <span class="secondary-action"> |
| 83 disabled="[[syncStatus.setupInProgress]]"> | 83 <paper-button class="action-button" on-tap="onSigninTap_" |
| 84 $i18n{syncSignin} | 84 disabled="[[syncStatus.setupInProgress]]"> |
| 85 </paper-button> | 85 $i18n{syncSignin} |
| 86 </paper-button> |
| 87 </span> |
| 86 </template> | 88 </template> |
| 87 <template is="dom-if" if="[[syncStatus.signedIn]]"> | 89 <template is="dom-if" if="[[syncStatus.signedIn]]"> |
| 88 <span class="secondary-action"> | 90 <span class="secondary-action"> |
| 89 <paper-button class="secondary-button" on-tap="onDisconnectTap_" | 91 <paper-button class="secondary-button" on-tap="onDisconnectTap_" |
| 90 disabled="[[syncStatus.setupInProgress]]"> | 92 disabled="[[syncStatus.setupInProgress]]"> |
| 91 $i18n{syncDisconnect} | 93 $i18n{syncDisconnect} |
| 92 </paper-button> | 94 </paper-button> |
| 93 </span> | 95 </span> |
| 94 </template> | 96 </template> |
| 95 </if> | 97 </if> |
| 96 </div> | 98 </div> |
| 97 <div class="settings-box two-line" hidden="[[syncStatus.signedIn]]"> | 99 <div class="settings-box two-line" hidden="[[syncStatus.signedIn]]"> |
| 98 $i18n{syncOverview} | 100 $i18n{syncOverview} |
| 99 </div> | 101 </div> |
| 100 | 102 |
| 101 <div class="settings-box" hidden="[[!isStatusTextSet_(syncStatus)]]"> | 103 <div class="settings-box" hidden="[[!isStatusTextSet_(syncStatus)]]"> |
| 102 <span id="syncStatusText"></span> | 104 <span id="syncStatusText"></span> |
| 103 <paper-button on-tap="onSyncTap_"> | 105 <paper-button on-tap="onSyncTap_"> |
| 104 [[syncStatus.actionLinkText]] | 106 [[syncStatus.actionLinkText]] |
| 105 </paper-button> | 107 </paper-button> |
| 106 </div> | 108 </div> |
| 107 | 109 |
| 108 <template is="dom-if" | 110 <template is="dom-if" |
| 109 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 111 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 110 <div class="settings-box"> | 112 <div class="settings-box button-strip"> |
| 111 <paper-button on-tap="onSyncTap_" class="primary-button"> | 113 <paper-button on-tap="onSyncTap_" class="primary-button"> |
| 112 $i18n{syncPageTitle} | 114 $i18n{syncPageTitle} |
| 113 </paper-button> | 115 </paper-button> |
| 114 </div> | 116 </div> |
| 115 </template> | 117 </template> |
| 116 | 118 |
| 117 <div class="settings-box" id="activity-controls" | 119 <div class="settings-box" id="activity-controls" |
| 118 on-tap="onActivityControlsTap_"> | 120 on-tap="onActivityControlsTap_"> |
| 119 <div id="googleg-logo-container"> | 121 <div id="googleg-logo-container"> |
| 120 <div id="googleg-logo"></div> | 122 <div id="googleg-logo"></div> |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 <paper-button id="easyUnlockTurnOff" class="secondary-button" | 180 <paper-button id="easyUnlockTurnOff" class="secondary-button" |
| 179 on-tap="onEasyUnlockTurnOffTap_"> | 181 on-tap="onEasyUnlockTurnOffTap_"> |
| 180 $i18n{easyUnlockTurnOffButton} | 182 $i18n{easyUnlockTurnOffButton} |
| 181 </paper-button> | 183 </paper-button> |
| 182 </template> | 184 </template> |
| 183 </div> | 185 </div> |
| 184 </div> | 186 </div> |
| 185 </template> | 187 </template> |
| 186 </if> | 188 </if> |
| 187 | 189 |
| 188 <div class="settings-box"> | 190 <div class="settings-box button-strip"> |
| 189 <paper-button class="primary-button" on-tap="onManageOtherPeople_"> | 191 <paper-button class="primary-button" on-tap="onManageOtherPeople_"> |
| 190 $i18n{manageOtherPeople} | 192 $i18n{manageOtherPeople} |
| 191 </paper-button> | 193 </paper-button> |
| 192 </div> | 194 </div> |
| 193 </neon-animatable> | 195 </neon-animatable> |
| 194 <template is="dom-if" name="sync"> | 196 <template is="dom-if" name="sync"> |
| 195 <settings-subpage page-title="$i18n{syncPageTitle}"> | 197 <settings-subpage page-title="$i18n{syncPageTitle}"> |
| 196 <settings-sync-page current-route="[[currentRoute]]"> | 198 <settings-sync-page current-route="[[currentRoute]]"> |
| 197 </settings-sync-page> | 199 </settings-sync-page> |
| 198 </settings-subpage> | 200 </settings-subpage> |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 | 241 |
| 240 <if expr="chromeos"> | 242 <if expr="chromeos"> |
| 241 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 243 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 242 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 244 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 243 </easy-unlock-turn-off-dialog> | 245 </easy-unlock-turn-off-dialog> |
| 244 </template> | 246 </template> |
| 245 </if> | 247 </if> |
| 246 </template> | 248 </template> |
| 247 <script src="people_page.js"></script> | 249 <script src="people_page.js"></script> |
| 248 </dom-module> | 250 </dom-module> |
| OLD | NEW |