| OLD | NEW |
| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 hidden$="[[!isStatus_(pages.SPINNER, pageStatus_)]]"> | 54 hidden$="[[!isStatus_(pages.SPINNER, pageStatus_)]]"> |
| 55 $i18n{syncLoading} | 55 $i18n{syncLoading} |
| 56 </div> | 56 </div> |
| 57 <div id="[[pages.TIMEOUT]]" class="settings-box first" | 57 <div id="[[pages.TIMEOUT]]" class="settings-box first" |
| 58 hidden$="[[!isStatus_(pages.TIMEOUT, pageStatus_)]]"> | 58 hidden$="[[!isStatus_(pages.TIMEOUT, pageStatus_)]]"> |
| 59 $i18n{syncTimeout} | 59 $i18n{syncTimeout} |
| 60 </div> | 60 </div> |
| 61 <div id="[[pages.CONFIGURE]]" | 61 <div id="[[pages.CONFIGURE]]" |
| 62 hidden$="[[!isStatus_(pages.CONFIGURE, pageStatus_)]]"> | 62 hidden$="[[!isStatus_(pages.CONFIGURE, pageStatus_)]]"> |
| 63 <div class="settings-box first"> | 63 <div class="settings-box first"> |
| 64 <div class="start">$i18n{syncEverythingCheckboxLabel}</div> | 64 <div id="syncEverythingCheckboxLabel" class="start"> |
| 65 $i18n{syncEverythingCheckboxLabel} |
| 66 </div> |
| 65 <paper-toggle-button id="syncAllDataTypesControl" | 67 <paper-toggle-button id="syncAllDataTypesControl" |
| 66 checked="{{syncPrefs.syncAllDataTypes}}" | 68 checked="{{syncPrefs.syncAllDataTypes}}" |
| 67 on-change="onSyncAllDataTypesChanged_"> | 69 on-change="onSyncAllDataTypesChanged_" |
| 70 aria-labelledby="syncEverythingCheckboxLabel"> |
| 68 </paper-toggle-button> | 71 </paper-toggle-button> |
| 69 </div> | 72 </div> |
| 70 | 73 |
| 71 <div class="list-frame" id="sync-data-types"> | 74 <div class="list-frame" id="sync-data-types"> |
| 72 <div class="layout horizontal list-item" | 75 <div class="layout horizontal list-item" |
| 73 hidden="[[!syncPrefs.appsRegistered]]"> | 76 hidden="[[!syncPrefs.appsRegistered]]"> |
| 74 <div class="flex">$i18n{appCheckboxLabel}</div> | 77 <div id="appCheckboxLabel" class="flex">$i18n{appCheckboxLabel}</div> |
| 75 <paper-toggle-button checked="{{syncPrefs.appsSynced}}" | 78 <paper-toggle-button checked="{{syncPrefs.appsSynced}}" |
| 76 on-change="onSingleSyncDataTypeChanged_" | 79 on-change="onSingleSyncDataTypeChanged_" |
| 77 disabled="[[shouldSyncCheckboxBeDisabled_( | 80 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 78 syncPrefs.syncAllDataTypes, syncPrefs.appsEnforced)]]"> | 81 syncPrefs.syncAllDataTypes, syncPrefs.appsEnforced)]]" |
| 82 aria-labelledby="appCheckboxLabel"> |
| 79 </paper-toggle-button> | 83 </paper-toggle-button> |
| 80 </div> | 84 </div> |
| 81 | 85 |
| 82 <div class="layout horizontal list-item" | 86 <div class="layout horizontal list-item" |
| 83 hidden="[[!syncPrefs.autofillRegistered]]"> | 87 hidden="[[!syncPrefs.autofillRegistered]]"> |
| 84 <div class="flex">$i18n{autofillCheckboxLabel}</div> | 88 <div id="autofillCheckboxLabel" class="flex"> |
| 89 $i18n{autofillCheckboxLabel} |
| 90 </div> |
| 85 <!-- Autofill has a special on-change handler to deal with | 91 <!-- Autofill has a special on-change handler to deal with |
| 86 Payments integriation. --> | 92 Payments integriation. --> |
| 87 <paper-toggle-button checked="{{syncPrefs.autofillSynced}}" | 93 <paper-toggle-button checked="{{syncPrefs.autofillSynced}}" |
| 88 on-change="onAutofillDataTypeChanged_" | 94 on-change="onAutofillDataTypeChanged_" |
| 89 disabled="[[shouldSyncCheckboxBeDisabled_( | 95 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 90 syncPrefs.syncAllDataTypes, syncPrefs.autofillEnforced)]]"> | 96 syncPrefs.syncAllDataTypes, syncPrefs.autofillEnforced)]]" |
| 97 aria-labelledby="autofillCheckboxLabel"> |
| 91 </paper-toggle-button> | 98 </paper-toggle-button> |
| 92 </div> | 99 </div> |
| 93 | 100 |
| 94 <div class="layout horizontal list-item" | 101 <div class="layout horizontal list-item" |
| 95 hidden="[[!syncPrefs.bookmarksRegistered]]"> | 102 hidden="[[!syncPrefs.bookmarksRegistered]]"> |
| 96 <div class="flex">$i18n{bookmarksCheckboxLabel}</div> | 103 <div id="bookmarksCheckboxLabel" class="flex"> |
| 104 $i18n{bookmarksCheckboxLabel} |
| 105 </div> |
| 97 <paper-toggle-button checked="{{syncPrefs.bookmarksSynced}}" | 106 <paper-toggle-button checked="{{syncPrefs.bookmarksSynced}}" |
| 98 on-change="onSingleSyncDataTypeChanged_" | 107 on-change="onSingleSyncDataTypeChanged_" |
| 99 disabled="[[shouldSyncCheckboxBeDisabled_( | 108 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 100 syncPrefs.syncAllDataTypes, syncPrefs.bookmarksEnforced)]]"> | 109 syncPrefs.syncAllDataTypes, syncPrefs.bookmarksEnforced)]]" |
| 110 aria-labelledby="bookmarksCheckboxLabel"> |
| 101 </paper-toggle-button> | 111 </paper-toggle-button> |
| 102 </div> | 112 </div> |
| 103 | 113 |
| 104 <div class="layout horizontal list-item" | 114 <div class="layout horizontal list-item" |
| 105 hidden="[[!syncPrefs.extensionsRegistered]]"> | 115 hidden="[[!syncPrefs.extensionsRegistered]]"> |
| 106 <div class="flex">$i18n{extensionsCheckboxLabel}</div> | 116 <div id="extensionsCheckboxLabel" class="flex"> |
| 117 $i18n{extensionsCheckboxLabel} |
| 118 </div> |
| 107 <paper-toggle-button checked="{{syncPrefs.extensionsSynced}}" | 119 <paper-toggle-button checked="{{syncPrefs.extensionsSynced}}" |
| 108 on-change="onSingleSyncDataTypeChanged_" | 120 on-change="onSingleSyncDataTypeChanged_" |
| 109 disabled="[[shouldSyncCheckboxBeDisabled_( | 121 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 110 syncPrefs.syncAllDataTypes, syncPrefs.extensionsEnforced)]]"> | 122 syncPrefs.syncAllDataTypes, syncPrefs.extensionsEnforced)]]" |
| 123 aria-labelledby="extensionsCheckboxLabel"> |
| 111 </paper-toggle-button> | 124 </paper-toggle-button> |
| 112 </div> | 125 </div> |
| 113 | 126 |
| 114 <div class="layout horizontal list-item" | 127 <div class="layout horizontal list-item" |
| 115 hidden="[[!syncPrefs.typedUrlsRegistered]]"> | 128 hidden="[[!syncPrefs.typedUrlsRegistered]]"> |
| 116 <div class="flex">$i18n{historyCheckboxLabel}</div> | 129 <div id="historyCheckboxLabel" class="flex"> |
| 130 $i18n{historyCheckboxLabel} |
| 131 </div> |
| 117 <paper-toggle-button checked="{{syncPrefs.typedUrlsSynced}}" | 132 <paper-toggle-button checked="{{syncPrefs.typedUrlsSynced}}" |
| 118 on-change="onSingleSyncDataTypeChanged_" | 133 on-change="onSingleSyncDataTypeChanged_" |
| 119 disabled="[[shouldSyncCheckboxBeDisabled_( | 134 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 120 syncPrefs.syncAllDataTypes, syncPrefs.typedUrlsEnforced)]]"> | 135 syncPrefs.syncAllDataTypes, syncPrefs.typedUrlsEnforced)]]" |
| 136 aria-labelledby="historyCheckboxLabel"> |
| 121 </paper-toggle-button> | 137 </paper-toggle-button> |
| 122 </div> | 138 </div> |
| 123 | 139 |
| 124 <div class="layout horizontal list-item" | 140 <div class="layout horizontal list-item" |
| 125 hidden="[[!syncPrefs.passwordsRegistered]]"> | 141 hidden="[[!syncPrefs.passwordsRegistered]]"> |
| 126 <div class="flex">$i18n{passwordsCheckboxLabel}</div> | 142 <div id="passwordsCheckboxLabel" class="flex"> |
| 143 $i18n{passwordsCheckboxLabel} |
| 144 </div> |
| 127 <paper-toggle-button checked="{{syncPrefs.passwordsSynced}}" | 145 <paper-toggle-button checked="{{syncPrefs.passwordsSynced}}" |
| 128 on-change="onSingleSyncDataTypeChanged_" | 146 on-change="onSingleSyncDataTypeChanged_" |
| 129 disabled="[[shouldSyncCheckboxBeDisabled_( | 147 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 130 syncPrefs.syncAllDataTypes, syncPrefs.passwordsEnforced)]]"> | 148 syncPrefs.syncAllDataTypes, syncPrefs.passwordsEnforced)]]" |
| 149 aria-labelledby="passwordsCheckboxLabel"> |
| 131 </paper-toggle-button> | 150 </paper-toggle-button> |
| 132 </div> | 151 </div> |
| 133 | 152 |
| 134 <div class="layout horizontal list-item" | 153 <div class="layout horizontal list-item" |
| 135 hidden="[[!syncPrefs.preferencesRegistered]]"> | 154 hidden="[[!syncPrefs.preferencesRegistered]]"> |
| 136 <div class="flex">$i18n{settingsCheckboxLabel}</div> | 155 <div id="settingsCheckboxLabel" class="flex"> |
| 156 $i18n{settingsCheckboxLabel} |
| 157 </div> |
| 137 <paper-toggle-button checked="{{syncPrefs.preferencesSynced}}" | 158 <paper-toggle-button checked="{{syncPrefs.preferencesSynced}}" |
| 138 on-change="onSingleSyncDataTypeChanged_" | 159 on-change="onSingleSyncDataTypeChanged_" |
| 139 disabled="[[shouldSyncCheckboxBeDisabled_( | 160 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 140 syncPrefs.syncAllDataTypes, syncPrefs.preferencesEnforced)]]"> | 161 syncPrefs.syncAllDataTypes, syncPrefs.preferencesEnforced)]]" |
| 162 aria-labelledby="settingsCheckboxLabel"> |
| 141 </paper-toggle-button> | 163 </paper-toggle-button> |
| 142 </div> | 164 </div> |
| 143 | 165 |
| 144 <div class="layout horizontal list-item" | 166 <div class="layout horizontal list-item" |
| 145 hidden="[[!syncPrefs.themesRegistered]]"> | 167 hidden="[[!syncPrefs.themesRegistered]]"> |
| 146 <div class="flex">$i18n{themesAndWallpapersCheckboxLabel}</div> | 168 <div id="themesAndWallpapersCheckboxLabel" class="flex"> |
| 169 $i18n{themesAndWallpapersCheckboxLabel} |
| 170 </div> |
| 147 <paper-toggle-button checked="{{syncPrefs.themesSynced}}" | 171 <paper-toggle-button checked="{{syncPrefs.themesSynced}}" |
| 148 on-change="onSingleSyncDataTypeChanged_" | 172 on-change="onSingleSyncDataTypeChanged_" |
| 149 disabled="[[shouldSyncCheckboxBeDisabled_( | 173 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 150 syncPrefs.syncAllDataTypes, syncPrefs.themesEnforced)]]"> | 174 syncPrefs.syncAllDataTypes, syncPrefs.themesEnforced)]]" |
| 175 aria-labelledby="themesAndWallpapersCheckboxLabel"> |
| 151 </paper-toggle-button> | 176 </paper-toggle-button> |
| 152 </div> | 177 </div> |
| 153 | 178 |
| 154 <div class="layout horizontal list-item" | 179 <div class="layout horizontal list-item" |
| 155 hidden="[[!syncPrefs.tabsRegistered]]"> | 180 hidden="[[!syncPrefs.tabsRegistered]]"> |
| 156 <div class="flex">$i18n{openTabsCheckboxLabel}</div> | 181 <div id="openTabsCheckboxLabel" class="flex"> |
| 182 $i18n{openTabsCheckboxLabel} |
| 183 </div> |
| 157 <paper-toggle-button checked="{{syncPrefs.tabsSynced}}" | 184 <paper-toggle-button checked="{{syncPrefs.tabsSynced}}" |
| 158 on-change="onSingleSyncDataTypeChanged_" | 185 on-change="onSingleSyncDataTypeChanged_" |
| 159 disabled="[[shouldSyncCheckboxBeDisabled_( | 186 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 160 syncPrefs.syncAllDataTypes, syncPrefs.tabsEnforced)]]"> | 187 syncPrefs.syncAllDataTypes, syncPrefs.tabsEnforced)]]" |
| 188 aria-labelledby="openTabsCheckboxLabel"> |
| 161 </paper-toggle-button> | 189 </paper-toggle-button> |
| 162 </div> | 190 </div> |
| 163 | 191 |
| 164 <div class="layout horizontal list-item" | 192 <div class="layout horizontal list-item" |
| 165 hidden="[[!syncPrefs.autofillRegistered]]"> | 193 hidden="[[!syncPrefs.autofillRegistered]]"> |
| 166 <!-- The Payments integration checkbox is a special case in many ways. | 194 <!-- The Payments integration checkbox is a special case in many ways. |
| 167 It's visible only if autofill is registered. It's disabled and | 195 It's visible only if autofill is registered. It's disabled and |
| 168 unchecked if autofill is unchecked.--> | 196 unchecked if autofill is unchecked.--> |
| 169 <div class="flex"> | 197 <div class="flex"> |
| 170 $i18n{enablePaymentsIntegrationCheckboxLabel} | 198 $i18n{enablePaymentsIntegrationCheckboxLabel} |
| 171 <a href="$i18nRaw{autofillHelpURL}" target="_blank"> | 199 <a href="$i18nRaw{autofillHelpURL}" target="_blank"> |
| 172 $i18n{learnMore} | 200 $i18n{learnMore} |
| 173 </a> | 201 </a> |
| 174 </div> | 202 </div> |
| 175 <paper-toggle-button | 203 <paper-toggle-button |
| 176 checked="{{syncPrefs.paymentsIntegrationEnabled}}" | 204 checked="{{syncPrefs.paymentsIntegrationEnabled}}" |
| 177 on-change="onSingleSyncDataTypeChanged_" | 205 on-change="onSingleSyncDataTypeChanged_" |
| 178 disabled="[[shouldPaymentsCheckboxBeDisabled_( | 206 disabled="[[shouldPaymentsCheckboxBeDisabled_( |
| 179 syncPrefs.syncAllDataTypes, syncPrefs.autofillSynced)]]"> | 207 syncPrefs.syncAllDataTypes, syncPrefs.autofillSynced)]]" |
| 208 aria-label="$i18n{enablePaymentsIntegrationCheckboxLabel}"> |
| 180 </paper-toggle-button> | 209 </paper-toggle-button> |
| 181 </div> | 210 </div> |
| 182 </div> | 211 </div> |
| 183 | 212 |
| 184 <div class="settings-box two-line" actionable | 213 <div class="settings-box two-line" actionable |
| 185 on-tap="onManageSyncedDataTap_"> | 214 on-tap="onManageSyncedDataTap_"> |
| 186 <div class="start"> | 215 <div class="start"> |
| 187 $i18n{manageSyncedDataTitle} | 216 $i18n{manageSyncedDataTitle} |
| 188 <div class="secondary" id="manageSyncedDataSecondary"> | 217 <div class="secondary" id="manageSyncedDataSecondary"> |
| 189 $i18n{manageSyncedDataDescription} | 218 $i18n{manageSyncedDataDescription} |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 </div> | 312 </div> |
| 284 <div id="passphraseRecoverHint" class="list-item"> | 313 <div id="passphraseRecoverHint" class="list-item"> |
| 285 <span>$i18nRaw{passphraseRecover}</span> | 314 <span>$i18nRaw{passphraseRecover}</span> |
| 286 </div> | 315 </div> |
| 287 </div> | 316 </div> |
| 288 </template> | 317 </template> |
| 289 </div> | 318 </div> |
| 290 </template> | 319 </template> |
| 291 <script src="sync_page.js"></script> | 320 <script src="sync_page.js"></script> |
| 292 </dom-module> | 321 </dom-module> |
| OLD | NEW |