Make it so that turning off sync for extensions in the preferences UI also

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 98 matching lines @@
 
   bool sync_autofill;
   if (!result->GetBoolean("syncAutofill", &sync_autofill))
     return false;
   if (sync_autofill)
     config->data_types.insert(syncable::AUTOFILL);
 
   bool sync_extensions;
   if (!result->GetBoolean("syncExtensions", &sync_extensions))
     return false;
-  if (sync_extensions)
+  if (sync_extensions) {
     config->data_types.insert(syncable::EXTENSIONS);
+    config->data_types.insert(syncable::EXTENSION_SETTINGS);
+  }
 
   bool sync_typed_urls;
   if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
     return false;
   if (sync_typed_urls)
     config->data_types.insert(syncable::TYPED_URLS);
 
   bool sync_search_engines;
   if (!result->GetBoolean("syncSearchEngines", &sync_search_engines))
     return false;
   if (sync_search_engines)
     config->data_types.insert(syncable::SEARCH_ENGINES);
 
   bool sync_sessions;
   if (!result->GetBoolean("syncSessions", &sync_sessions))
     return false;
   if (sync_sessions)
     config->data_types.insert(syncable::SESSIONS);
 
   bool sync_apps;
   if (!result->GetBoolean("syncApps", &sync_apps))
     return false;
-  if (sync_apps)
+  if (sync_apps) {
     config->data_types.insert(syncable::APPS);
+    config->data_types.insert(syncable::APP_SETTINGS);
+  }
 
   // Encryption settings.
   if (!result->GetBoolean("encryptAllData", &config->encrypt_all))
     return false;
 
   // Passphrase settings.
   bool have_passphrase;
   if (!result->GetBoolean("usePassphrase", &have_passphrase))
     return false;
 
@@ skipping 46 matching lines @@
       ((types.find(syncable::PREFERENCES) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncPreferences)) ||
       ((types.find(syncable::THEMES) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncThemes)) ||
       ((types.find(syncable::PASSWORDS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncPasswords)) ||
       ((types.find(syncable::AUTOFILL) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncAutofill)) ||
       ((types.find(syncable::EXTENSIONS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncExtensions)) ||
+      ((types.find(syncable::EXTENSION_SETTINGS) != types.end()) !=
+       pref_service->GetBoolean(prefs::kSyncExtensionSettings)) ||
       ((types.find(syncable::TYPED_URLS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncTypedUrls)) ||
       ((types.find(syncable::SEARCH_ENGINES) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncSearchEngines)) ||
       ((types.find(syncable::SESSIONS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncSessions)) ||
       ((types.find(syncable::APPS) != types.end()) !=
-       pref_service->GetBoolean(prefs::kSyncApps)))
+       pref_service->GetBoolean(prefs::kSyncApps)) ||
+      ((types.find(syncable::APP_SETTINGS) != types.end()) !=
+       pref_service->GetBoolean(prefs::kSyncAppSettings)))
     return true;
 
   return false;
 }
 
 bool GetPassphrase(const std::string& json, std::string* passphrase) {
   scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
   if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
     return false;
 
@@ skipping 356 matching lines @@
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncPreferences",
           types.find(syncable::PREFERENCES) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncThemes",
           types.find(syncable::THEMES) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncPasswords",
           types.find(syncable::PASSWORDS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncAutofill",
           types.find(syncable::AUTOFILL) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncExtensions",
           types.find(syncable::EXTENSIONS) != types.end());
+      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncExtensionSettings",
+          types.find(syncable::EXTENSION_SETTINGS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncTypedUrls",
           types.find(syncable::TYPED_URLS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncSearchEngines",
           types.find(syncable::SEARCH_ENGINES) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncSessions",
           types.find(syncable::SESSIONS) != types.end());
       UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncApps",
           types.find(syncable::APPS) != types.end());
+      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncAppSettings",
+          types.find(syncable::APP_SETTINGS) != types.end());
       COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
                      UpdateCustomConfigHistogram);
     }
     UMA_HISTOGRAM_BOOLEAN("Sync.EncryptAllData", configuration.encrypt_all);
     UMA_HISTOGRAM_BOOLEAN("Sync.CustomPassphrase",
                           configuration.set_gaia_passphrase ||
                           configuration.set_secondary_passphrase);
   }
 }
 
@@ skipping 130 matching lines @@
 }
 
 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) {
   DictionaryValue args;
   Profile* profile = Profile::FromWebUI(web_ui_);
   ProfileSyncService* service = profile->GetProfileSyncService();
   SyncSetupFlow::GetArgsForGaiaLogin(service, &args);
   args.SetString("error_message", error_message);
   ShowGaiaLogin(args);
 }