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

Unified Diff: chrome/browser/ui/webui/sync_setup_handler.cc

Issue 9500005: Add a declarative way in c/b/s/sync_prefs.cc to say which data types have prefs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 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/ui/webui/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 76313c8c8f4d41351f4b1877f75223ecb106b29d..7c93a0b3f1a74f7e09de623949b29b10a24f5f7c 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -104,10 +104,8 @@ bool GetConfiguration(const std::string& json, SyncConfiguration* config) {
bool sync_extensions;
if (!result->GetBoolean("syncExtensions", &sync_extensions))
return false;
- if (sync_extensions) {
+ if (sync_extensions)
config->data_types.Put(syncable::EXTENSIONS);
- config->data_types.Put(syncable::EXTENSION_SETTINGS);
- }
bool sync_typed_urls;
if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
@@ -124,10 +122,8 @@ bool GetConfiguration(const std::string& json, SyncConfiguration* config) {
bool sync_apps;
if (!result->GetBoolean("syncApps", &sync_apps))
return false;
- if (sync_apps) {
+ if (sync_apps)
config->data_types.Put(syncable::APPS);
- config->data_types.Put(syncable::APP_SETTINGS);
- }
// Encryption settings.
if (!result->GetBoolean("encryptAllData", &config->encrypt_all))
« chrome/browser/sync/sync_prefs.cc ('K') | « chrome/browser/sync/sync_prefs_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698