Chromium Code Reviews| Index: chrome/browser/resources/settings/people_page/sync_page.html |
| diff --git a/chrome/browser/resources/settings/people_page/sync_page.html b/chrome/browser/resources/settings/people_page/sync_page.html |
| index 6e35e0e20ae3a0df29fe0d1ef512182ad7d26473..9feea143ecb1ecb784fec2c68431af912bd396ef 100644 |
| --- a/chrome/browser/resources/settings/people_page/sync_page.html |
| +++ b/chrome/browser/resources/settings/people_page/sync_page.html |
| @@ -48,13 +48,16 @@ |
| syncPrefs.syncAllDataTypes, syncPrefs.appsEnforced)]]"> |
| $i18n{appCheckboxLabel} |
| </paper-checkbox> |
| + |
| + <!-- Autofill has a special on-change handler to deal with Wallet. --> |
|
Justin Donnelly
2016/06/14 19:56:41
s/Wallet/Payments/ (Replace "Wallet" with "Payment
tommycli
2016/06/14 20:42:09
Done.
|
| <paper-checkbox checked="{{syncPrefs.autofillSynced}}" |
| - on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| + on-change="onAutofillDataTypeChanged_" class="list-item" |
| hidden="[[!syncPrefs.autofillRegistered]]" |
| disabled="[[shouldSyncCheckboxBeDisabled_( |
| syncPrefs.syncAllDataTypes, syncPrefs.autofillEnforced)]]"> |
| $i18n{autofillCheckboxLabel} |
| </paper-checkbox> |
| + |
| <paper-checkbox checked="{{syncPrefs.bookmarksSynced}}" |
| on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| hidden="[[!syncPrefs.bookmarksRegistered]]" |
| @@ -97,12 +100,19 @@ |
| syncPrefs.syncAllDataTypes, syncPrefs.themesEnforced)]]"> |
| $i18n{themesAndWallpapersCheckboxLabel} |
| </paper-checkbox> |
| - <paper-checkbox checked="{{syncPrefs.tabsSynced}}" |
|
Justin Donnelly
2016/06/14 19:56:41
Is this intentional that you're removing the tabs
tommycli
2016/06/14 20:42:09
Done.
Thanks. It was a mistake that I removed thi
|
| + |
| + <!-- The payments integration checkbox is a special case in many ways. |
| + It's visible only if autofill is registered. It's disabled and |
| + unchecked if autofill is unchecked.--> |
| + <paper-checkbox checked="{{syncPrefs.paymentsIntegrationEnabled}}" |
| on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| - hidden="[[!syncPrefs.tabsRegistered]]" |
| - disabled="[[shouldSyncCheckboxBeDisabled_( |
| - syncPrefs.syncAllDataTypes, syncPrefs.tabsEnforced)]]"> |
| - $i18n{openTabsCheckboxLabel} |
| + hidden="[[!syncPrefs.autofillRegistered]]" |
| + disabled="[[shouldWalletCheckboxBeDisabled_( |
|
Justin Donnelly
2016/06/14 19:56:41
s/Wallet/Payments/
tommycli
2016/06/14 20:42:09
Done.
|
| + syncPrefs.syncAllDataTypes, syncPrefs.autofillSynced)]]"> |
| + $i18n{enablePaymentsIntegrationCheckboxLabel} |
| + <a href="$i18nRaw{autofillHelpURL}" target="_blank"> |
| + $i18n{learnMore} |
| + </a> |
| </paper-checkbox> |
| </div> |