Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: chrome/browser/resources/settings/people_page/sync_page.html

Issue 2805003005: MD Settings: Move Activity Controls link to Sync subpage (Closed)
Patch Set: remove an obsolete test Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html">
5 <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-button/paper-butt on.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html">
10 <link rel="import" href="sync_browser_proxy.html"> 10 <link rel="import" href="sync_browser_proxy.html">
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 checked="{{syncPrefs.paymentsIntegrationEnabled}}" 243 checked="{{syncPrefs.paymentsIntegrationEnabled}}"
244 on-change="onSingleSyncDataTypeChanged_" 244 on-change="onSingleSyncDataTypeChanged_"
245 disabled="[[shouldPaymentsCheckboxBeDisabled_( 245 disabled="[[shouldPaymentsCheckboxBeDisabled_(
246 syncPrefs.syncAllDataTypes, syncPrefs.autofillSynced)]]" 246 syncPrefs.syncAllDataTypes, syncPrefs.autofillSynced)]]"
247 aria-label="$i18n{enablePaymentsIntegrationCheckboxLabel}"> 247 aria-label="$i18n{enablePaymentsIntegrationCheckboxLabel}">
248 </paper-toggle-button> 248 </paper-toggle-button>
249 </div> 249 </div>
250 </div> 250 </div>
251 251
252 <div class="settings-box two-line" actionable 252 <div class="settings-box two-line" actionable
253 on-tap="onActivityControlsTap_">
254 <div class="start">
255 $i18n{personalizeGoogleServicesTitle}
256 <div class="secondary" id="activityControlsSecondary">
257 $i18n{personalizeGoogleServicesText}
258 </div>
259 </div>
260 <button class="icon-external" is="paper-icon-button-light"
261 aria-label="$i18n{personalizeGoogleServicesTitle}"
262 aria-describedby="activityControlsSecondary"></button>
263 </div>
264
265 <div class="settings-box two-line" actionable
253 on-tap="onManageSyncedDataTap_"> 266 on-tap="onManageSyncedDataTap_">
254 <div class="start"> 267 <div class="start">
255 $i18n{manageSyncedDataTitle} 268 $i18n{manageSyncedDataTitle}
256 <div class="secondary" id="manageSyncedDataSecondary"> 269 <div class="secondary" id="manageSyncedDataSecondary">
257 $i18n{manageSyncedDataDescription} 270 $i18n{manageSyncedDataDescription}
258 </div> 271 </div>
259 </div> 272 </div>
260 <button class="icon-external" is="paper-icon-button-light" 273 <button class="icon-external" is="paper-icon-button-light"
261 aria-label="$i18n{manageSyncedDataTitle}" 274 aria-label="$i18n{manageSyncedDataTitle}"
262 aria-describedby="manageSyncedDataSecondary"></button> 275 aria-describedby="manageSyncedDataSecondary"></button>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 confirmation_)]]"> 334 confirmation_)]]">
322 $i18n{save} 335 $i18n{save}
323 </paper-button> 336 </paper-button>
324 </div> 337 </div>
325 </div> 338 </div>
326 </template> 339 </template>
327 </div> 340 </div>
328 </template> 341 </template>
329 <script src="sync_page.js"></script> 342 <script src="sync_page.js"></script>
330 </dom-module> 343 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698