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

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

Issue 2068653003: Settings People Revamp: Add Payments integration to new Sync Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 6 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-pages/iron-pages.h tml"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml">
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-checkbox/paper-ch eckbox.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html">
8 <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-input/paper-input .html">
9 <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-button/pape r-radio-button.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html">
(...skipping 30 matching lines...) Expand all
41 </div> 41 </div>
42 42
43 <div class="list-frame"> 43 <div class="list-frame">
44 <paper-checkbox checked="{{syncPrefs.appsSynced}}" 44 <paper-checkbox checked="{{syncPrefs.appsSynced}}"
45 on-change="onSingleSyncDataTypeChanged_" class="list-item" 45 on-change="onSingleSyncDataTypeChanged_" class="list-item"
46 hidden="[[!syncPrefs.appsRegistered]]" 46 hidden="[[!syncPrefs.appsRegistered]]"
47 disabled="[[shouldSyncCheckboxBeDisabled_( 47 disabled="[[shouldSyncCheckboxBeDisabled_(
48 syncPrefs.syncAllDataTypes, syncPrefs.appsEnforced)]]"> 48 syncPrefs.syncAllDataTypes, syncPrefs.appsEnforced)]]">
49 $i18n{appCheckboxLabel} 49 $i18n{appCheckboxLabel}
50 </paper-checkbox> 50 </paper-checkbox>
51
52 <!-- 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.
51 <paper-checkbox checked="{{syncPrefs.autofillSynced}}" 53 <paper-checkbox checked="{{syncPrefs.autofillSynced}}"
52 on-change="onSingleSyncDataTypeChanged_" class="list-item" 54 on-change="onAutofillDataTypeChanged_" class="list-item"
53 hidden="[[!syncPrefs.autofillRegistered]]" 55 hidden="[[!syncPrefs.autofillRegistered]]"
54 disabled="[[shouldSyncCheckboxBeDisabled_( 56 disabled="[[shouldSyncCheckboxBeDisabled_(
55 syncPrefs.syncAllDataTypes, syncPrefs.autofillEnforced)]]"> 57 syncPrefs.syncAllDataTypes, syncPrefs.autofillEnforced)]]">
56 $i18n{autofillCheckboxLabel} 58 $i18n{autofillCheckboxLabel}
57 </paper-checkbox> 59 </paper-checkbox>
60
58 <paper-checkbox checked="{{syncPrefs.bookmarksSynced}}" 61 <paper-checkbox checked="{{syncPrefs.bookmarksSynced}}"
59 on-change="onSingleSyncDataTypeChanged_" class="list-item" 62 on-change="onSingleSyncDataTypeChanged_" class="list-item"
60 hidden="[[!syncPrefs.bookmarksRegistered]]" 63 hidden="[[!syncPrefs.bookmarksRegistered]]"
61 disabled="[[shouldSyncCheckboxBeDisabled_( 64 disabled="[[shouldSyncCheckboxBeDisabled_(
62 syncPrefs.syncAllDataTypes, syncPrefs.bookmarksEnforced)]]"> 65 syncPrefs.syncAllDataTypes, syncPrefs.bookmarksEnforced)]]">
63 $i18n{bookmarksCheckboxLabel} 66 $i18n{bookmarksCheckboxLabel}
64 </paper-checkbox> 67 </paper-checkbox>
65 <paper-checkbox checked="{{syncPrefs.extensionsSynced}}" 68 <paper-checkbox checked="{{syncPrefs.extensionsSynced}}"
66 on-change="onSingleSyncDataTypeChanged_" class="list-item" 69 on-change="onSingleSyncDataTypeChanged_" class="list-item"
67 hidden="[[!syncPrefs.extensionsRegistered]]" 70 hidden="[[!syncPrefs.extensionsRegistered]]"
(...skipping 22 matching lines...) Expand all
90 syncPrefs.syncAllDataTypes, syncPrefs.preferencesEnforced)]]"> 93 syncPrefs.syncAllDataTypes, syncPrefs.preferencesEnforced)]]">
91 $i18n{settingsCheckboxLabel} 94 $i18n{settingsCheckboxLabel}
92 </paper-checkbox> 95 </paper-checkbox>
93 <paper-checkbox checked="{{syncPrefs.themesSynced}}" 96 <paper-checkbox checked="{{syncPrefs.themesSynced}}"
94 on-change="onSingleSyncDataTypeChanged_" class="list-item" 97 on-change="onSingleSyncDataTypeChanged_" class="list-item"
95 hidden="[[!syncPrefs.themesRegistered]]" 98 hidden="[[!syncPrefs.themesRegistered]]"
96 disabled="[[shouldSyncCheckboxBeDisabled_( 99 disabled="[[shouldSyncCheckboxBeDisabled_(
97 syncPrefs.syncAllDataTypes, syncPrefs.themesEnforced)]]"> 100 syncPrefs.syncAllDataTypes, syncPrefs.themesEnforced)]]">
98 $i18n{themesAndWallpapersCheckboxLabel} 101 $i18n{themesAndWallpapersCheckboxLabel}
99 </paper-checkbox> 102 </paper-checkbox>
100 <paper-checkbox checked="{{syncPrefs.tabsSynced}}" 103
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
104 <!-- The payments integration checkbox is a special case in many ways.
105 It's visible only if autofill is registered. It's disabled and
106 unchecked if autofill is unchecked.-->
107 <paper-checkbox checked="{{syncPrefs.paymentsIntegrationEnabled}}"
101 on-change="onSingleSyncDataTypeChanged_" class="list-item" 108 on-change="onSingleSyncDataTypeChanged_" class="list-item"
102 hidden="[[!syncPrefs.tabsRegistered]]" 109 hidden="[[!syncPrefs.autofillRegistered]]"
103 disabled="[[shouldSyncCheckboxBeDisabled_( 110 disabled="[[shouldWalletCheckboxBeDisabled_(
Justin Donnelly 2016/06/14 19:56:41 s/Wallet/Payments/
tommycli 2016/06/14 20:42:09 Done.
104 syncPrefs.syncAllDataTypes, syncPrefs.tabsEnforced)]]"> 111 syncPrefs.syncAllDataTypes, syncPrefs.autofillSynced)]]">
105 $i18n{openTabsCheckboxLabel} 112 $i18n{enablePaymentsIntegrationCheckboxLabel}
113 <a href="$i18nRaw{autofillHelpURL}" target="_blank">
114 $i18n{learnMore}
115 </a>
106 </paper-checkbox> 116 </paper-checkbox>
107 </div> 117 </div>
108 118
109 <div class="settings-box two-line"> 119 <div class="settings-box two-line">
110 <div class="start"> 120 <div class="start">
111 $i18n{encryptionOptionsTitle} 121 $i18n{encryptionOptionsTitle}
112 <div class="secondary"> 122 <div class="secondary">
113 $i18n{syncDataEncryptedText} 123 $i18n{syncDataEncryptedText}
114 </div> 124 </div>
115 </div> 125 </div>
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 on-tap="onSubmitExistingPassphraseTap_" class="action-button"> 182 on-tap="onSubmitExistingPassphraseTap_" class="action-button">
173 $i18n{submitPassphraseButton} 183 $i18n{submitPassphraseButton}
174 </paper-button> 184 </paper-button>
175 </div> 185 </div>
176 </template> 186 </template>
177 </div> 187 </div>
178 </iron-pages> 188 </iron-pages>
179 </template> 189 </template>
180 <script src="sync_page.js"></script> 190 <script src="sync_page.js"></script>
181 </dom-module> 191 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698