| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 [[syncStatus.statusText]] | 125 [[syncStatus.statusText]] |
| 126 </div> | 126 </div> |
| 127 <div class="secondary sync-error" | 127 <div class="secondary sync-error" |
| 128 hidden="[[!syncStatus.hasError]]"> | 128 hidden="[[!syncStatus.hasError]]"> |
| 129 [[syncStatus.statusText]] | 129 [[syncStatus.statusText]] |
| 130 </div> | 130 </div> |
| 131 </div> | 131 </div> |
| 132 </div> | 132 </div> |
| 133 </template> | 133 </template> |
| 134 | 134 |
| 135 <div class="settings-box" id="activity-controls" | 135 <div class="settings-box two-line" id="activity-controls" |
| 136 on-tap="onActivityControlsTap_"> | 136 on-tap="onActivityControlsTap_"> |
| 137 <div id="googleg-logo-container"> | 137 <div id="googleg-logo-container"> |
| 138 <div id="googleg-logo"></div> | 138 <div id="googleg-logo"></div> |
| 139 </div> | 139 </div> |
| 140 <div class="middle"> | 140 <div class="middle"> |
| 141 <div>$i18n{personalizeGoogleServicesTitle}</div> | 141 <div>$i18n{personalizeGoogleServicesTitle}</div> |
| 142 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 142 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
| 143 </div> | 143 </div> |
| 144 </div> | 144 </div> |
| 145 | 145 |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 | 257 |
| 258 <if expr="chromeos"> | 258 <if expr="chromeos"> |
| 259 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 259 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 260 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 260 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 261 </easy-unlock-turn-off-dialog> | 261 </easy-unlock-turn-off-dialog> |
| 262 </template> | 262 </template> |
| 263 </if> | 263 </if> |
| 264 </template> | 264 </template> |
| 265 <script src="people_page.js"></script> | 265 <script src="people_page.js"></script> |
| 266 </dom-module> | 266 </dom-module> |
| OLD | NEW |