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

6 files changed, 17 insertions, 18 deletions

diff --git a/chrome/browser/resources/sync_setup_overlay.html b/chrome/browser/resources/sync_setup_overlay.html
index 6dbea8d..49e95a2 100644
--- a/chrome/browser/resources/sync_setup_overlay.html
+++ b/chrome/browser/resources/sync_setup_overlay.html
@@ -258,7 +258,7 @@
         <div id="sync-configure-content" class="content-area">
           <div id="sync-select-container">
             <select id="sync-select-datatypes">
-              <option i18n-content="keepEverythingSynced" selected></option>
+              <option i18n-content="syncAllDataTypes" selected></option>
               <option i18n-content="chooseDataTypes"></option>
             </select>
             <div id="choose-data-types-body">
diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js
index 39f5b8d..3f53457 100644
--- a/chrome/browser/resources/sync_setup_overlay.js
+++ b/chrome/browser/resources/sync_setup_overlay.js
@@ -251,7 +251,7 @@ cr.define('options', function() {
       // 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 || $('bookmarks-checkbox').checked,
           "syncPreferences": syncAll || $('preferences-checkbox').checked,
           "syncThemes": syncAll || $('themes-checkbox').checked,
@@ -319,7 +319,7 @@ cr.define('options', function() {
 
     setChooseDataTypesCheckboxes_: function(args) {
       var datatypeSelect = document.getElementById('sync-select-datatypes');
-      datatypeSelect.selectedIndex = args.keepEverythingSynced ? 0 : 1;
+      datatypeSelect.selectedIndex = args.syncAllDataTypes ? 0 : 1;
 
       $('bookmarks-checkbox').checked = args.syncBookmarks;
       $('preferences-checkbox').checked = args.syncPreferences;
@@ -368,7 +368,7 @@ cr.define('options', function() {
         $('sessions-item').className = "sync-item-hide";
       }
 
-      this.setCheckboxesToKeepEverythingSynced_(args.keepEverythingSynced);
+      this.setCheckboxesToKeepEverythingSynced_(args.syncAllDataTypes);
     },
 
     setEncryptionRadios_: function(args) {
@@ -433,11 +433,11 @@ cr.define('options', function() {
 
         // Whether to display the 'Sync everything' confirmation page or the
         // customize data types page.
-        var keepEverythingSynced = args['keepEverythingSynced'];
+        var syncAllDataTypes = args['syncAllDataTypes'];
         this.usePassphrase_ = args['usePassphrase'];
         if (args['showSyncEverythingPage'] == false || this.usePassphrase_ ||
-            keepEverythingSynced == false || args['show_passphrase']) {
-          this.showCustomizePage_(args, keepEverythingSynced);
+            syncAllDataTypes == false || args['show_passphrase']) {
+          this.showCustomizePage_(args, syncAllDataTypes);
         } else {
           this.showSyncEverythingPage_();
         }
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,
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index c1366a2..3264701 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -119,7 +119,7 @@ void SyncSetupFlow::GetArgsForConfigure(ProfileSyncService* service,
   // The SYNC_EVERYTHING case will set this to true.
   args->SetBoolean("showSyncEverythingPage", false);
 
-  args->SetBoolean("keepEverythingSynced",
+  args->SetBoolean("syncAllDataTypes",
       service->profile()->GetPrefs()->GetBoolean(prefs::kKeepEverythingSynced));
 
   // Bookmarks, Preferences, and Themes are launched for good, there's no
diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc
index 4fcddb9..40db748 100644
--- a/chrome/browser/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc
@@ -329,7 +329,7 @@ TEST_F(SyncSetupWizardTest, ChooseDataTypesSetsPrefs) {
 
   ListValue data_type_choices_value;
   std::string data_type_choices =
-      "{\"keepEverythingSynced\":false,\"syncBookmarks\":true,"
+      "{\"syncAllDataTypes\":false,\"syncBookmarks\":true,"
       "\"syncPreferences\":true,\"syncThemes\":false,\"syncPasswords\":false,"
       "\"syncAutofill\":false,\"syncExtensions\":false,\"syncTypedUrls\":true,"
       "\"syncApps\":true,\"syncSearchEngines\":false,\"syncSessions\":false,"
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 73e213f..3bca854 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -66,7 +66,7 @@ bool GetConfiguration(const std::string& json, SyncConfiguration* config) {
     return false;
 
   DictionaryValue* result = static_cast<DictionaryValue*>(parsed_value.get());
-  if (!result->GetBoolean("keepEverythingSynced", &config->sync_everything))
+  if (!result->GetBoolean("syncAllDataTypes", &config->sync_everything))
     return false;
 
   // These values need to be kept in sync with where they are written in
@@ -243,7 +243,7 @@ void SyncSetupHandler::GetStaticLocalizedValues(
     { "enterAccessCode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL },
     { "getAccessCodeHelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL },
     { "getAccessCodeURL", IDS_SYNC_GET_ACCESS_CODE_URL },
-    { "keepEverythingSynced", IDS_SYNC_EVERYTHING },
+    { "syncAllDataTypes", IDS_SYNC_EVERYTHING },
     { "chooseDataTypes", IDS_SYNC_CHOOSE_DATATYPES },
     { "bookmarks", IDS_SYNC_DATATYPE_BOOKMARKS },
     { "preferences", IDS_SYNC_DATATYPE_PREFERENCES },