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

Unified Diff: chrome/browser/sync/glue/ui_data_type_controller.cc

Issue 23129007: sync: Add GetAllSyncData to sync/api (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add GetAllSyncDataReturnError Created 7 years, 3 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/sync/glue/ui_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/ui_data_type_controller.cc b/chrome/browser/sync/glue/ui_data_type_controller.cc
index 1ed6b863b6d895841b93d520c72221d1a715b98c..5448d3002ca0e8ccf2237ab4026f81a899e142a4 100644
--- a/chrome/browser/sync/glue/ui_data_type_controller.cc
+++ b/chrome/browser/sync/glue/ui_data_type_controller.cc
@@ -166,9 +166,10 @@ void UIDataTypeController::Associate() {
}
base::TimeTicks start_time = base::TimeTicks::Now();
- syncer::SyncError error;
syncer::SyncDataList initial_sync_data;
- error = shared_change_processor_->GetSyncData(&initial_sync_data);
+ syncer::SyncError error =
+ shared_change_processor_->GetAllSyncDataReturnError(
+ type(), &initial_sync_data);
Nicolas Zea 2013/09/05 00:13:08 nit: fix indent
tim (not reviewing) 2013/09/05 00:22:24 Done.
if (error.IsSet()) {
local_merge_result.set_error(error);
StartDone(ASSOCIATION_FAILED,

Powered by Google App Engine
This is Rietveld 408576698