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

Unified Diff: chrome/browser/resources/sync_setup_overlay.js

Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master
Patch Set: resolve conflicts with https://codereview.chromium.org/673983003 Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/sync_setup_overlay.js
diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js
index 976d7a3da060ac99857e950d7c78fd846cc31c87..77d900a26c34114f6e519c02c53dfaacafdca3da 100644
--- a/chrome/browser/resources/sync_setup_overlay.js
+++ b/chrome/browser/resources/sync_setup_overlay.js
@@ -306,7 +306,7 @@ cr.define('options', function() {
$('use-default-link').onclick = null;
// These values need to be kept in sync with where they are read in
- // SyncSetupFlow::GetDataTypeChoiceData().
+ // sync_setup_handler.cc:GetConfiguration().
var syncAll = $('sync-select-datatypes').selectedIndex ==
options.DataTypeSelection.SYNC_EVERYTHING;
var syncNothing = $('sync-select-datatypes').selectedIndex ==
@@ -323,6 +323,8 @@ cr.define('options', function() {
'typedUrlsSynced': syncAll || $('typed-urls-checkbox').checked,
'appsSynced': syncAll || $('apps-checkbox').checked,
'tabsSynced': syncAll || $('tabs-checkbox').checked,
+ 'wifiCredentialsSynced': syncAll ||
+ $('wifi-credentials-checkbox').checked,
'encryptAllData': encryptAllData,
'usePassphrase': usePassphrase,
'isGooglePassphrase': googlePassphrase,
@@ -439,6 +441,17 @@ cr.define('options', function() {
} else {
$('tabs-item').hidden = true;
}
+ if (args.wifiCredentialsRegistered) {
+ $('wifi-credentials-checkbox').checked = args.wifiCredentialsSynced;
+ dataTypeBoxesChecked_['wifi-credentials-checkbox'] =
+ args.wifiCredentialsSynced;
+ dataTypeBoxesDisabled_['wifi-credentials-checkbox'] =
+ args.wifiCredentialsEnforced;
Roger Tawa OOO till Jul 10th 2014/10/29 13:55:03 Indent 447 and 449 two more spaces.
mukesh agrawal 2014/10/29 18:17:11 Done.
+ $('wifi-credentials-checkbox').onclick = this.handleDataTypeClick_;
+ $('wifi-credentials-item').hidden = false;
+ } else {
+ $('wifi-credentials-item').hidden = true;
+ }
this.setDataTypeCheckboxes_(datatypeSelect.selectedIndex);
},

Powered by Google App Engine
This is Rietveld 408576698