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"> |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 121 </div> | 121 </div> |
| 122 <div class="middle"> | 122 <div class="middle"> |
| 123 <div>$i18n{personalizeGoogleServicesTitle}</div> | 123 <div>$i18n{personalizeGoogleServicesTitle}</div> |
| 124 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 124 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
| 125 </div> | 125 </div> |
| 126 </div> | 126 </div> |
| 127 | 127 |
| 128 <if expr="chromeos"> | 128 <if expr="chromeos"> |
| 129 <div class="settings-box"> | 129 <div class="settings-box"> |
| 130 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 130 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 131 i18n-values="label:enableScreenlock"> | 131 label="$i18n{enableScreenlock}"> |
| 132 </settings-checkbox> | 132 </settings-checkbox> |
| 133 </div> | 133 </div> |
| 134 | 134 |
| 135 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 135 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| 136 <div class="settings-box"> | 136 <div class="settings-box"> |
| 137 <div class="middle"> | 137 <div class="middle"> |
| 138 <div>$i18n{easyUnlockSectionTitle}</div> | 138 <div>$i18n{easyUnlockSectionTitle}</div> |
| 139 <div class="secondary"> | 139 <div class="secondary"> |
| 140 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 140 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
| 141 $i18n{easyUnlockSetupIntro} | 141 $i18n{easyUnlockSetupIntro} |
| 142 </template> | 142 </template> |
| 143 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 143 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 144 $i18n{easyUnlockDescription} | 144 $i18n{easyUnlockDescription} |
| 145 </template> | 145 </template> |
| 146 <a target="_blank" href$="$i18n{easyUnlockLearnMoreURL}"> | 146 <a target="_blank" href$="$i18n{easyUnlockLearnMoreURL}"> |
| 147 $i18n{learnMore} | 147 $i18n{learnMore} |
| 148 </a> | 148 </a> |
| 149 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 149 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 150 <template is="dom-if" | 150 <template is="dom-if" |
| 151 if="[[easyUnlockProximityDetectionAllowed_]]"> | 151 if="[[easyUnlockProximityDetectionAllowed_]]"> |
| 152 <settings-checkbox | 152 <settings-checkbox |
| 153 pref="{{prefs.easy_unlock.proximity_required}}" | 153 pref="{{prefs.easy_unlock.proximity_required}}" |
| 154 i18n-values="label:easyUnlockRequireProximityLabel"> | 154 label="$i18n{easyUnlockRequireProximityLabel}"> |
| 155 </settings-checkbox> | 155 </settings-checkbox> |
| 156 </template> | 156 </template> |
| 157 </template> | 157 </template> |
| 158 </div> | 158 </div> |
| 159 </div> | 159 </div> |
| 160 <div class="secondary-action"> | 160 <div class="secondary-action"> |
| 161 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 161 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
| 162 <paper-button id="easyUnlockSetup" class="secondary-button" | 162 <paper-button id="easyUnlockSetup" class="secondary-button" |
| 163 on-tap="onEasyUnlockSetupTap_"> | 163 on-tap="onEasyUnlockSetupTap_"> |
| 164 $i18n{easyUnlockSetupButton} | 164 $i18n{easyUnlockSetupButton} |
| 165 </paper-button> | 165 </paper-button> |
| 166 </template> | 166 </template> |
| 167 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 167 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 168 <paper-button id="easyUnlockTurnOff" class="secondary-button" | 168 <paper-button id="easyUnlockTurnOff" class="secondary-button" |
| 169 on-tap="onEasyUnlockTurnOffTap_"> | 169 on-tap="onEasyUnlockTurnOffTap_"> |
| 170 $i18n{easyUnlockTurnOffButton} | 170 $i18n{easyUnlockTurnOffButton} |
| 171 </paper-button> | 171 </paper-button> |
| 172 </template> | 172 </template> |
| 173 </div> | 173 </div> |
| 174 </div> | 174 </div> |
| 175 </template> | 175 </template> |
| 176 </if> | 176 </if> |
| 177 | 177 |
| 178 <div class="settings-box"> | 178 <div class="settings-box"> |
| 179 <paper-button class="primary-button" i18n-content="manageOtherPeople" | 179 <paper-button class="primary-button" on-tap="onManageOtherPeople_"> |
| 180 on-tap="onManageOtherPeople_"> | 180 $i18n{manageOtherPeople} |
| 181 </paper-button> | 181 </paper-button> |
| 182 </div> | 182 </div> |
| 183 </neon-animatable> | 183 </neon-animatable> |
| 184 <template is="dom-if" name="sync"> | 184 <template is="dom-if" name="sync"> |
| 185 <settings-subpage page-title="$i18n{syncPageTitle}"> | 185 <settings-subpage page-title="$i18n{syncPageTitle}"> |
| 186 <settings-sync-page current-route="[[currentRoute]]"> | 186 <settings-sync-page current-route="[[currentRoute]]"> |
| 187 </settings-sync-page> | 187 </settings-sync-page> |
| 188 </settings-subpage> | 188 </settings-subpage> |
| 189 </template> | 189 </template> |
| 190 <if expr="chromeos"> | 190 <if expr="chromeos"> |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 204 <settings-subpage page-title="$i18n{editPerson}"> | 204 <settings-subpage page-title="$i18n{editPerson}"> |
| 205 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" | 205 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" |
| 206 profile-name="[[profileName_]]"> | 206 profile-name="[[profileName_]]"> |
| 207 </settings-manage-profile> | 207 </settings-manage-profile> |
| 208 </settings-subpage> | 208 </settings-subpage> |
| 209 </template> | 209 </template> |
| 210 </if> | 210 </if> |
| 211 </settings-animated-pages> | 211 </settings-animated-pages> |
| 212 | 212 |
| 213 <paper-dialog modal id="disconnectDialog"> | 213 <paper-dialog modal id="disconnectDialog"> |
| 214 <h2 i18n-content="syncDisconnectTitle"></h2> | 214 <h2>$i18n{syncDisconnectTitle}</h2> |
| 215 <div i18n-values=".innerHTML:syncDisconnectExplanation"></div> | 215 <div>$i18nRaw{syncDisconnectExplanation}"</div> |
|
Dan Beam
2016/06/20 23:20:18
whoops
| |
| 216 <if expr="(not chromeos and is_posix) or is_win or is_macosx"> | 216 <if expr="(not chromeos and is_posix) or is_win or is_macosx"> |
| 217 <paper-checkbox id="deleteProfile" | 217 <paper-checkbox id="deleteProfile"> |
| 218 i18n-content="syncDisconnectDeleteProfile"> | 218 $i18n{syncDisconnectDeleteProfile} |
| 219 </paper-checkbox> | 219 </paper-checkbox> |
| 220 </if> | 220 </if> |
| 221 <div class="button-strip"> | 221 <div class="button-strip"> |
| 222 <paper-button dialog-dismiss i18n-content="cancel"> | 222 <paper-button dialog-dismiss>$i18n{cancel}</paper-button> |
| 223 </paper-button> | |
| 224 <paper-button dialog-confirm class="action-button" | 223 <paper-button dialog-confirm class="action-button" |
| 225 on-tap="onDisconnectConfirm_" i18n-content="syncDisconnectConfirm"> | 224 on-tap="onDisconnectConfirm_"> |
| 225 $i18n{syncDisconnectConfirm} | |
| 226 </paper-button> | 226 </paper-button> |
| 227 </div> | 227 </div> |
| 228 </paper-dialog> | 228 </paper-dialog> |
| 229 | 229 |
| 230 <if expr="chromeos"> | 230 <if expr="chromeos"> |
| 231 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 231 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 232 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 232 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 233 </easy-unlock-turn-off-dialog> | 233 </easy-unlock-turn-off-dialog> |
| 234 </template> | 234 </template> |
| 235 </if> | 235 </if> |
| 236 </template> | 236 </template> |
| 237 <script src="people_page.js"></script> | 237 <script src="people_page.js"></script> |
| 238 </dom-module> | 238 </dom-module> |
| OLD | NEW |