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

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

Issue 14018026: sync: SyncableService support for starting sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Haitao's comments 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
Index: chrome/browser/webdata/autocomplete_syncable_service.cc
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc
index 11edecd56ce8fcc8a8d20162b6f3545382f9326d..76333fa8f74186f6556ac31dd34388c460d0a832 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.cc
+++ b/chrome/browser/webdata/autocomplete_syncable_service.cc
@@ -127,6 +127,12 @@ AutocompleteSyncableService::AutocompleteSyncableService()
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
}
+
+void AutocompleteSyncableService::InjectStartSyncFlare(
+ const syncer::StartSyncFlare& flare) {
+ flare_ = flare;
+}
+
syncer::SyncMergeResult AutocompleteSyncableService::MergeDataAndStartSyncing(
syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
@@ -308,8 +314,12 @@ void AutocompleteSyncableService::AutofillEntriesChanged(
// up we are going to process all when MergeData..() is called. If we receive
// notification after the sync exited, it will be sinced next time Chrome
// starts.
- if (sync_processor_.get())
+ if (sync_processor_.get()) {
ActOnChanges(changes);
+ } else if (!flare_.is_null()) {
+ flare_.Run(syncer::AUTOFILL);
+ flare_.Reset();
+ }
}
bool AutocompleteSyncableService::LoadAutofillData(

Powered by Google App Engine
This is Rietveld 408576698