summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/sync_setup_flow.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 23:45:15 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 23:45:15 +0000
commit06e3320d99ac84f65837749d579b4768e8d071f7 (patch)
treea7aea731cdb80b5d2c9789a7c3a02f81437a6832 /chrome/browser/sync/sync_setup_flow.cc
parentd42dcaf955342366222bea93f476de8d1aaedaad (diff)
downloadchromium_src-06e3320d99ac84f65837749d579b4768e8d071f7.zip
chromium_src-06e3320d99ac84f65837749d579b4768e8d071f7.tar.gz
chromium_src-06e3320d99ac84f65837749d579b4768e8d071f7.tar.bz2
Implemented apps sync (behind a flag).
BUG=46512 TEST=manual Review URL: http://codereview.chromium.org/3186002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_setup_flow.cc')
-rw-r--r--chrome/browser/sync/sync_setup_flow.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index d3b048f..1fecbad 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -112,6 +112,12 @@ static bool GetDataTypeChoiceData(const std::string& json,
if (sync_typed_urls)
data_types->insert(syncable::TYPED_URLS);
+ bool sync_apps;
+ if (!result->GetBoolean(L"syncApps", &sync_apps))
+ return false;
+ if (sync_apps)
+ data_types->insert(syncable::APPS);
+
return true;
}
@@ -353,6 +359,8 @@ void SyncSetupFlow::GetArgsForChooseDataTypes(ProfileSyncService* service,
registered_types.count(syncable::EXTENSIONS) > 0);
args->SetBoolean("typedUrlsRegistered",
registered_types.count(syncable::TYPED_URLS) > 0);
+ args->SetBoolean(L"appsRegistered",
+ registered_types.count(syncable::APPS) > 0);
args->SetBoolean("syncBookmarks",
service->profile()->GetPrefs()->GetBoolean(prefs::kSyncBookmarks));
@@ -368,6 +376,8 @@ void SyncSetupFlow::GetArgsForChooseDataTypes(ProfileSyncService* service,
service->profile()->GetPrefs()->GetBoolean(prefs::kSyncExtensions));
args->SetBoolean("syncTypedUrls",
service->profile()->GetPrefs()->GetBoolean(prefs::kSyncTypedUrls));
+ args->SetBoolean(L"syncApps",
+ service->profile()->GetPrefs()->GetBoolean(prefs::kSyncApps));
}
void SyncSetupFlow::GetDOMMessageHandlers(