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

Unified Diff: chrome/browser/webdata/web_data_service_factory.cc

Issue 14018026: sync: SyncableService support for starting sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: isherman's review Created 7 years, 8 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
« no previous file with comments | « chrome/browser/webdata/autocomplete_syncable_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/web_data_service_factory.cc
diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc
index e1dec21985c3b668ba9ff562bdd1dc0320e0e1cf..b9a3230e503fed8f4aa12f76d8eff6ab5b58f8cd 100644
--- a/chrome/browser/webdata/web_data_service_factory.cc
+++ b/chrome/browser/webdata/web_data_service_factory.cc
@@ -8,6 +8,7 @@
#include "base/files/file_path.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/sync/glue/sync_start_util.h"
#include "chrome/browser/ui/profile_error_dialog.h"
#include "chrome/browser/webdata/autocomplete_syncable_service.h"
#include "chrome/browser/webdata/autofill_profile_syncable_service.h"
@@ -39,12 +40,15 @@ void ProfileErrorCallback(sql::InitStatus status) {
void InitSyncableServicesOnDBThread(
scoped_refptr<AutofillWebDataService> autofill_web_data,
+ const syncer::SyncableService::StartSyncFlare& flare,
const std::string& app_locale) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
// Currently only Autocomplete and Autofill profiles use the new Sync API, but
// all the database data should migrate to this API over time.
AutocompleteSyncableService::CreateForWebDataService(autofill_web_data);
+ AutocompleteSyncableService::FromWebDataService(
+ autofill_web_data)->InjectStartSyncFlare(flare);
AutofillProfileSyncableService::CreateForWebDataService(
autofill_web_data, app_locale);
}
@@ -94,6 +98,7 @@ WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) {
BrowserThread::DB, FROM_HERE,
base::Bind(&InitSyncableServicesOnDBThread,
autofill_web_data_,
+ sync_start_util::GetFlareForSyncableService(path),
g_browser_process->GetApplicationLocale()));
}
« no previous file with comments | « chrome/browser/webdata/autocomplete_syncable_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698