Chromium Code Reviews| 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 4e866ca2dd4c1059f58606ca05e9b15db9c05ed7..92c98d05ba5e01f1188047bd8827838e68cac2fe 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(). |
|
pavely
2014/10/24 23:00:33
Thanks for updating comment.
|
| 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 || |
| + $('wifiCredentials-checkbox').checked, |
|
pavely
2014/10/24 23:00:33
I think this should be 'wifi-credentials-checkbox'
mukesh agrawal
2014/10/25 00:39:43
Done.
|
| 'encryptAllData': encryptAllData, |
| 'usePassphrase': usePassphrase, |
| 'isGooglePassphrase': googlePassphrase, |
| @@ -439,6 +441,15 @@ cr.define('options', function() { |
| } else { |
| $('tabs-item').hidden = true; |
| } |
| + if (args.wifiCredentialsRegistered) { |
| + $('wifi-credentials-checkbox').checked = args.wifiCredentialsSynced; |
| + dataTypeBoxes_['wifi-credentials-checkbox'] = |
|
pavely
2014/10/24 23:00:34
dataTypeBoxesChecked_[...] =
mukesh agrawal
2014/10/25 00:39:43
Done.
|
| + args.wifiCredentialsSynced; |
|
pavely
2014/10/24 23:00:33
dataTypeBoxesDisabled_[...] = args.wifiCredentials
mukesh agrawal
2014/10/25 00:39:43
Done.
|
| + $('wifi-credentials-checkbox').onclick = this.handleDataTypeClick_; |
| + $('wifi-credentials-item').hidden = false; |
| + } else { |
| + $('wifi-credentials-item').hidden = true; |
| + } |
| this.setDataTypeCheckboxes_(datatypeSelect.selectedIndex); |
| }, |