summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/resources
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 17:38:11 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 17:38:11 +0000
commitff34710d1fd12e8ef3c8694c9ca94ecd8cef5a15 (patch)
treee4db084dd272100b33884b4b32358b8e1694afce /chrome/browser/sync/resources
parentcbd9d61085622fbfa07abc037aa6059e7dadab82 (diff)
downloadchromium_src-ff34710d1fd12e8ef3c8694c9ca94ecd8cef5a15.zip
chromium_src-ff34710d1fd12e8ef3c8694c9ca94ecd8cef5a15.tar.gz
chromium_src-ff34710d1fd12e8ef3c8694c9ca94ecd8cef5a15.tar.bz2
sync: Rename keepEverythingSynced to syncAllDataTypes.
Note: This was a TODO for jhawkins@. R=jhawkins@chromium.org Review URL: http://codereview.chromium.org/7866042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/resources')
-rw-r--r--chrome/browser/sync/resources/configure.html13
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/sync/resources/configure.html b/chrome/browser/sync/resources/configure.html
index 3a8bdd2..2ce7d3b 100644
--- a/chrome/browser/sync/resources/configure.html
+++ b/chrome/browser/sync/resources/configure.html
@@ -255,9 +255,8 @@ html[os='mac'] input[type='submit'] {
// Whether to display the 'Sync everything' confirmation screen or the
// customize data types screen.
- // TODO(jhawkins): Rename |keepEverythingSynced| to |syncAllDataTypes|.
var syncEverything = args['syncEverything'];
- var syncAllDataTypes = args['keepEverythingSynced'];
+ var syncAllDataTypes = args['syncAllDataTypes'];
var usePassphrase = args['usePassphrase'];
if (syncEverything == false || syncAllDataTypes == false ||
usePassphrase) {
@@ -320,9 +319,9 @@ html[os='mac'] input[type='submit'] {
}
var datatypeSelect = document.getElementById('sync-select-datatypes');
- datatypeSelect.selectedIndex = args.keepEverythingSynced ? 0 : 1;
+ datatypeSelect.selectedIndex = args.syncAllDataTypes ? 0 : 1;
document.getElementById('chooseDataTypesBody').hidden =
- args.keepEverythingSynced;
+ args.syncAllDataTypes;
document.getElementById("bookmarksCheckbox").checked = args.syncBookmarks;
document.getElementById("preferencesCheckbox").checked =
@@ -375,7 +374,7 @@ html[os='mac'] input[type='submit'] {
document.getElementById("sessionsItem").className = "sync-item-hide";
}
- setCheckboxesToKeepEverythingSynced(args.keepEverythingSynced);
+ setCheckboxesToKeepEverythingSynced(args.syncAllDataTypes);
}
function setEncryptionCheckboxes(args) {
@@ -398,7 +397,7 @@ html[os='mac'] input[type='submit'] {
document.getElementById("aborted-text").className = "sync-error-show";
document.getElementById("okButton").disabled = true;
- document.getElementById("keepEverythingSyncedRadio").disabled = true;
+ document.getElementById("syncAllDataTypesRadio").disabled = true;
document.getElementById("chooseDataTypesRadio").disabled = true;
}
@@ -455,7 +454,7 @@ html[os='mac'] input[type='submit'] {
// These values need to be kept in sync with where they are read in
// SyncSetupFlow::GetDataTypeChoiceData().
var result = JSON.stringify({
- "keepEverythingSynced": syncAll,
+ "syncAllDataTypes": syncAll,
"syncBookmarks": syncAll || f.bookmarksCheckbox.checked,
"syncPreferences": syncAll || f.preferencesCheckbox.checked,
"syncThemes": syncAll || f.themesCheckbox.checked,