Chromium Code Reviews| 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/i18n_setup.html"> | 8 <link rel="import" href="chrome://md-settings/i18n_setup.html"> |
| 9 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> | 9 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> |
| 10 <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/profile_info_browser_p roxy.html"> |
| 11 <link rel="import" href="chrome://md-settings/people_page/sync_browser_proxy.htm l"> | 11 <link rel="import" href="chrome://md-settings/people_page/sync_browser_proxy.htm l"> |
| 12 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> | 12 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> |
| 13 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> | 13 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> |
| 14 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 14 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 15 | 15 |
| 16 <if expr="chromeos"> | 16 <if expr="chromeos"> |
| 17 <link rel="import" href="chrome://md-settings/people_page/change_picture.html"> | 17 <link rel="import" href="chrome://md-settings/people_page/change_picture.html"> |
| 18 <link rel="import" href="chrome://md-settings/people_page/pin_keyboard.html"> | |
| 18 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_browser_pr oxy.html"> | 19 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_browser_pr oxy.html"> |
| 19 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_turn_off_d ialog.html"> | 20 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_turn_off_d ialog.html"> |
| 20 <link rel="import" href="chrome://md-settings/people_page/users_page.html"> | 21 <link rel="import" href="chrome://md-settings/people_page/users_page.html"> |
| 21 </if> | 22 </if> |
| 22 <if expr="not chromeos"> | 23 <if expr="not chromeos"> |
| 23 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html"> | 24 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html"> |
| 24 </if> | 25 </if> |
| 25 | 26 |
| 26 <dom-module id="settings-people-page"> | 27 <dom-module id="settings-people-page"> |
| 27 <template> | 28 <template> |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 110 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 110 <div class="settings-box"> | 111 <div class="settings-box"> |
| 111 <paper-button on-tap="onSyncTap_" class="primary-button"> | 112 <paper-button on-tap="onSyncTap_" class="primary-button"> |
| 112 $i18n{syncPageTitle} | 113 $i18n{syncPageTitle} |
| 113 </paper-button> | 114 </paper-button> |
| 114 </div> | 115 </div> |
| 115 </template> | 116 </template> |
| 116 | 117 |
| 117 <div class="settings-box" id="activity-controls" | 118 <div class="settings-box" id="activity-controls" |
| 118 on-tap="onActivityControlsTap_"> | 119 on-tap="onActivityControlsTap_"> |
| 119 <div id="googleg-logo-container"> | 120 <div id="googleg-logo-container"> |
|
tommycli
2016/05/06 23:54:18
Can you use a plain img tag and position using fle
jdufault
2016/05/10 18:45:23
Sorry, this is a rebase change. I accidentally for
| |
| 120 <div id="googleg-logo"></div> | 121 <div id="googleg-logo"></div> |
| 121 </div> | 122 </div> |
| 122 <div class="middle"> | 123 <div class="middle"> |
| 123 <div>$i18n{personalizeGoogleServicesTitle}</div> | 124 <div>$i18n{personalizeGoogleServicesTitle}</div> |
| 124 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 125 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
| 125 </div> | 126 </div> |
| 126 </div> | 127 </div> |
| 127 | 128 |
| 128 <if expr="chromeos"> | 129 <if expr="chromeos"> |
| 130 <!-- TODO(jdufault): Confirm if this goes above or below easy unlock | |
| 131 settings. --> | |
| 132 <template is="dom-if" if=[[pinUnlockAllowed_]]> | |
| 133 <div class="settings-box"> | |
| 134 <!-- TODO(jdufault): i18n --> | |
| 135 <p>Quick Unlock PIN</p> | |
| 136 <pin-keyboard></pin-keyboard> | |
| 137 </div> | |
| 138 </template> | |
| 139 | |
| 129 <div class="settings-box"> | 140 <div class="settings-box"> |
| 130 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 141 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 131 i18n-values="label:enableScreenlock"> | 142 i18n-values="label:enableScreenlock"> |
| 132 </settings-checkbox> | 143 </settings-checkbox> |
| 133 </div> | 144 </div> |
| 134 | 145 |
| 135 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 146 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| 136 <div class="settings-box"> | 147 <div class="settings-box"> |
| 137 <div class="middle"> | 148 <div class="middle"> |
| 138 <div>$i18n{easyUnlockSectionTitle}</div> | 149 <div>$i18n{easyUnlockSectionTitle}</div> |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 229 | 240 |
| 230 <if expr="chromeos"> | 241 <if expr="chromeos"> |
| 231 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 242 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 232 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 243 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 233 </easy-unlock-turn-off-dialog> | 244 </easy-unlock-turn-off-dialog> |
| 234 </template> | 245 </template> |
| 235 </if> | 246 </if> |
| 236 </template> | 247 </template> |
| 237 <script src="people_page.js"></script> | 248 <script src="people_page.js"></script> |
| 238 </dom-module> | 249 </dom-module> |
| OLD | NEW |