| 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/iron-pages/iron-pages.h
tml"> | 3 <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/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-dropdown-menu/pap
er-dropdown-menu.html"> | 6 <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-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="chrome://md-settings/controls/settings_checkbox.html"> | 10 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 <paper-checkbox checked="{{syncPrefs.syncAllDataTypes}}" | 32 <paper-checkbox checked="{{syncPrefs.syncAllDataTypes}}" |
| 33 on-change="onSyncAllDataTypesChanged_"> | 33 on-change="onSyncAllDataTypesChanged_"> |
| 34 $i18n{syncEverythingCheckboxLabel} | 34 $i18n{syncEverythingCheckboxLabel} |
| 35 </paper-checkbox> | 35 </paper-checkbox> |
| 36 </div> | 36 </div> |
| 37 | 37 |
| 38 <div class="list-frame"> | 38 <div class="list-frame"> |
| 39 <paper-checkbox checked="{{syncPrefs.appsSynced}}" | 39 <paper-checkbox checked="{{syncPrefs.appsSynced}}" |
| 40 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 40 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 41 hidden="[[!syncPrefs.appsRegistered]]" | 41 hidden="[[!syncPrefs.appsRegistered]]" |
| 42 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.appsEnforced)]]"> | 42 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 43 syncPrefs.syncAllDataTypes, syncPrefs.appsEnforced)]]"> |
| 43 $i18n{appCheckboxLabel} | 44 $i18n{appCheckboxLabel} |
| 44 </paper-checkbox> | 45 </paper-checkbox> |
| 45 <paper-checkbox checked="{{syncPrefs.autofillSynced}}" | 46 <paper-checkbox checked="{{syncPrefs.autofillSynced}}" |
| 46 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 47 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 47 hidden="[[!syncPrefs.autofillRegistered]]" | 48 hidden="[[!syncPrefs.autofillRegistered]]" |
| 48 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.autofillEnforced)]]"> | 49 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 50 syncPrefs.syncAllDataTypes, syncPrefs.autofillEnforced)]]"> |
| 49 $i18n{autofillCheckboxLabel} | 51 $i18n{autofillCheckboxLabel} |
| 50 </paper-checkbox> | 52 </paper-checkbox> |
| 51 <paper-checkbox checked="{{syncPrefs.bookmarksSynced}}" | 53 <paper-checkbox checked="{{syncPrefs.bookmarksSynced}}" |
| 52 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 54 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 53 hidden="[[!syncPrefs.bookmarksRegistered]]" | 55 hidden="[[!syncPrefs.bookmarksRegistered]]" |
| 54 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.bookmarksEnforced)]]"> | 56 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 57 syncPrefs.syncAllDataTypes, syncPrefs.bookmarksEnforced)]]"> |
| 55 $i18n{bookmarksCheckboxLabel} | 58 $i18n{bookmarksCheckboxLabel} |
| 56 </paper-checkbox> | 59 </paper-checkbox> |
| 57 <paper-checkbox checked="{{syncPrefs.extensionsSynced}}" | 60 <paper-checkbox checked="{{syncPrefs.extensionsSynced}}" |
| 58 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 61 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 59 hidden="[[!syncPrefs.extensionsRegistered]]" | 62 hidden="[[!syncPrefs.extensionsRegistered]]" |
| 60 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.extensionsEnforced)]]"> | 63 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 64 syncPrefs.syncAllDataTypes, syncPrefs.extensionsEnforced)]]"> |
| 61 $i18n{extensionsCheckboxLabel} | 65 $i18n{extensionsCheckboxLabel} |
| 62 </paper-checkbox> | 66 </paper-checkbox> |
| 63 <paper-checkbox checked="{{syncPrefs.typedUrlsSynced}}" | 67 <paper-checkbox checked="{{syncPrefs.typedUrlsSynced}}" |
| 64 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 68 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 65 hidden="[[!syncPrefs.typedUrlsRegistered]]" | 69 hidden="[[!syncPrefs.typedUrlsRegistered]]" |
| 66 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.typedUrlsEnforced)]]"> | 70 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 71 syncPrefs.syncAllDataTypes, syncPrefs.typedUrlsEnforced)]]"> |
| 67 $i18n{historyCheckboxLabel} | 72 $i18n{historyCheckboxLabel} |
| 68 </paper-checkbox> | 73 </paper-checkbox> |
| 69 <paper-checkbox checked="{{syncPrefs.passwordsSynced}}" | 74 <paper-checkbox checked="{{syncPrefs.passwordsSynced}}" |
| 70 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 75 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 71 hidden="[[!syncPrefs.passwordsRegistered]]" | 76 hidden="[[!syncPrefs.passwordsRegistered]]" |
| 72 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.passwordsEnforced)]]"> | 77 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 78 syncPrefs.syncAllDataTypes, syncPrefs.passwordsEnforced)]]"> |
| 73 $i18n{passwordsCheckboxLabel} | 79 $i18n{passwordsCheckboxLabel} |
| 74 </paper-checkbox> | 80 </paper-checkbox> |
| 75 <paper-checkbox checked="{{syncPrefs.preferencesSynced}}" | 81 <paper-checkbox checked="{{syncPrefs.preferencesSynced}}" |
| 76 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 82 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 77 hidden="[[!syncPrefs.preferencesRegistered]]" | 83 hidden="[[!syncPrefs.preferencesRegistered]]" |
| 78 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.preferencesEnforced)]]"> | 84 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 85 syncPrefs.syncAllDataTypes, syncPrefs.preferencesEnforced)]]"> |
| 79 $i18n{settingsCheckboxLabel} | 86 $i18n{settingsCheckboxLabel} |
| 80 </paper-checkbox> | 87 </paper-checkbox> |
| 81 <paper-checkbox checked="{{syncPrefs.themesSynced}}" | 88 <paper-checkbox checked="{{syncPrefs.themesSynced}}" |
| 82 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 89 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 83 hidden="[[!syncPrefs.themesRegistered]]" | 90 hidden="[[!syncPrefs.themesRegistered]]" |
| 84 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.themesEnforced)]]"> | 91 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 92 syncPrefs.syncAllDataTypes, syncPrefs.themesEnforced)]]"> |
| 85 $i18n{themesAndWallpapersCheckboxLabel} | 93 $i18n{themesAndWallpapersCheckboxLabel} |
| 86 </paper-checkbox> | 94 </paper-checkbox> |
| 87 <paper-checkbox checked="{{syncPrefs.tabsSynced}}" | 95 <paper-checkbox checked="{{syncPrefs.tabsSynced}}" |
| 88 on-change="onSingleSyncDataTypeChanged_" class="list-item" | 96 on-change="onSingleSyncDataTypeChanged_" class="list-item" |
| 89 hidden="[[!syncPrefs.tabsRegistered]]" | 97 hidden="[[!syncPrefs.tabsRegistered]]" |
| 90 disabled="[[shouldSyncCheckboxBeDisabled_(syncPrefs.syncAllDataTyp
es, syncPrefs.tabsEnforced)]]"> | 98 disabled="[[shouldSyncCheckboxBeDisabled_( |
| 99 syncPrefs.syncAllDataTypes, syncPrefs.tabsEnforced)]]"> |
| 91 $i18n{openTabsCheckboxLabel} | 100 $i18n{openTabsCheckboxLabel} |
| 92 </paper-checkbox> | 101 </paper-checkbox> |
| 93 </div> | 102 </div> |
| 94 | 103 |
| 95 <div class="settings-box two-line"> | 104 <div class="settings-box two-line"> |
| 96 <div class="start"> | 105 <div class="start"> |
| 97 $i18n{encryptionOptionsTitle} | 106 $i18n{encryptionOptionsTitle} |
| 98 <div class="secondary"> | 107 <div class="secondary"> |
| 99 $i18n{syncDataEncryptedText} | 108 $i18n{syncDataEncryptedText} |
| 100 </div> | 109 </div> |
| 101 </div> | 110 </div> |
| 102 </div> | 111 </div> |
| 103 | 112 |
| 104 <template is="dom-if" if="[[!syncPrefs.passphraseRequired]]"> | 113 <template is="dom-if" if="[[!syncPrefs.passphraseRequired]]"> |
| 105 <div class="list-frame"> | 114 <div class="list-frame"> |
| 106 <paper-radio-group id="encryptRadioGroup" | 115 <paper-radio-group id="encryptRadioGroup" |
| 107 selected="[[selectedEncryptionRadio_(syncPrefs.passphraseTypeIsC
ustom)]]" | 116 selected="[[selectedEncryptionRadio_( |
| 117 syncPrefs.passphraseTypeIsCustom)]]" |
| 108 on-paper-radio-group-changed="onEncryptionRadioSelectionChanged_
"> | 118 on-paper-radio-group-changed="onEncryptionRadioSelectionChanged_
"> |
| 109 <paper-radio-button name="encrypt-with-google" | 119 <paper-radio-button name="encrypt-with-google" |
| 110 class="list-item" disabled="[[syncPrefs.encryptAllData]]"> | 120 class="list-item" disabled="[[syncPrefs.encryptAllData]]"> |
| 111 <span>[[i18n('encryptWithGoogleCredentialsLabel')]]</span> | 121 <span>$i18n{encryptWithGoogleCredentialsLabel}</span> |
| 112 </paper-radio-button> | 122 </paper-radio-button> |
| 113 <paper-radio-button name="encrypt-with-passphrase" | 123 <paper-radio-button name="encrypt-with-passphrase" |
| 114 class="list-item" disabled="[[syncPrefs.encryptAllData]]"> | 124 class="list-item" disabled="[[syncPrefs.encryptAllData]]"> |
| 115 <span>[[encryptWithPassphraseBody_(syncPrefs.fullEncryptionBody)
]]</span> | 125 <span> |
| 126 [[encryptWithPassphraseBody_(syncPrefs.fullEncryptionBody)]] |
| 127 </span> |
| 116 </paper-radio-button> | 128 </paper-radio-button> |
| 117 </paper-radio-group> | 129 </paper-radio-group> |
| 118 </div> | 130 </div> |
| 119 </template> | 131 </template> |
| 120 | 132 |
| 121 <template is="dom-if" if="[[creatingNewPassphrase_]]"> | 133 <template is="dom-if" if="[[creatingNewPassphrase_]]"> |
| 122 <div class="list-frame"> | 134 <div class="list-frame"> |
| 123 <div id="create-password-box"> | 135 <div id="create-password-box"> |
| 124 <div>[[i18n('passphraseExplanationText')]]</div> | 136 <div>$i18n{passphraseExplanationText}</div> |
| 125 <paper-input id="passphraseInput" type="password" | 137 <paper-input id="passphraseInput" type="password" |
| 126 placeholder="[[i18n('passphrasePlaceholder')]]"> | 138 placeholder="$i18n{passphrasePlaceholder}"> |
| 127 </paper-input> | 139 </paper-input> |
| 128 <paper-input id="passphraseConfirmationInput" type="password" | 140 <paper-input id="passphraseConfirmationInput" type="password" |
| 129 placeholder="[[i18n('passphraseConfirmationPlaceholder')]]"> | 141 placeholder="$i18n{passphraseConfirmationPlaceholder}"> |
| 130 </paper-input> | 142 </paper-input> |
| 131 <div id="emptyPassphraseError" hidden>[[i18n('emptyPassphraseError
')]]</div> | 143 <div id="emptyPassphraseError" hidden> |
| 132 <div id="mismatchedPassphraseError" hidden>[[i18n('mismatchedPassp
hraseError')]]</div> | 144 $i18n{emptyPassphraseError} |
| 145 </div> |
| 146 <div id="mismatchedPassphraseError" hidden> |
| 147 $i18n{mismatchedPassphraseError} |
| 148 </div> |
| 133 <paper-button on-tap="onSaveNewPassphraseTap_" | 149 <paper-button on-tap="onSaveNewPassphraseTap_" |
| 134 class="action-button"> | 150 class="action-button"> |
| 135 $i18n{save} | 151 $i18n{save} |
| 136 </paper-button> | 152 </paper-button> |
| 137 </div> | 153 </div> |
| 138 </div> | 154 </div> |
| 139 </template> | 155 </template> |
| 140 | 156 |
| 141 <template is="dom-if" if="[[syncPrefs.passphraseRequired]]"> | 157 <template is="dom-if" if="[[syncPrefs.passphraseRequired]]"> |
| 142 <div class="list-frame"> | 158 <div class="list-frame"> |
| 143 <div id="askCustomPassphraseMessage" | 159 <div id="askCustomPassphraseMessage" |
| 144 hidden$="[[!syncPrefs.passphraseTypeIsCustom]]"> | 160 hidden$="[[!syncPrefs.passphraseTypeIsCustom]]"> |
| 145 [[syncPrefs.enterPassphraseBody]] | 161 [[syncPrefs.enterPassphraseBody]] |
| 146 </div> | 162 </div> |
| 147 <div id="askOldGooglePassphraseMessage" | 163 <div id="askOldGooglePassphraseMessage" |
| 148 hidden$="[[syncPrefs.passphraseTypeIsCustom]]"> | 164 hidden$="[[syncPrefs.passphraseTypeIsCustom]]"> |
| 149 [[syncPrefs.enterGooglePassphraseBody]] | 165 [[syncPrefs.enterGooglePassphraseBody]] |
| 150 </div> | 166 </div> |
| 151 <paper-input id="existingPassphraseInput" type="password" | 167 <paper-input id="existingPassphraseInput" type="password" |
| 152 placeholder="[[i18n('passphrasePlaceholder')]]"> | 168 placeholder="$i18n{passphrasePlaceholder}"> |
| 153 </paper-input> | 169 </paper-input> |
| 154 <div id="incorrectPassphraseError" hidden>[[i18n('incorrectPassphras
eError')]]</div> | 170 <div id="incorrectPassphraseError" hidden> |
| 171 $i18n{incorrectPassphraseError} |
| 172 </div> |
| 155 <paper-button on-tap="onSubmitExistingPassphraseTap_" | 173 <paper-button on-tap="onSubmitExistingPassphraseTap_" |
| 156 class="action-button"> | 174 class="action-button"> |
| 157 $i18n{submitPassphraseButton} | 175 $i18n{submitPassphraseButton} |
| 158 </paper-button> | 176 </paper-button> |
| 159 </div> | 177 </div> |
| 160 </template> | 178 </template> |
| 161 </div> | 179 </div> |
| 162 </iron-pages> | 180 </iron-pages> |
| 163 </template> | 181 </template> |
| 164 <script src="sync_page.js"></script> | 182 <script src="sync_page.js"></script> |
| 165 </dom-module> | 183 </dom-module> |
| OLD | NEW |