chrome/browser/sync/glue/ui_data_type_controller.cc - Issue 23129007: sync: Add GetAllSyncData to sync/api

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: review comments 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:

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..24b0e51a2cc4bcd64cd3c93fb437c9af6a2e9859 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);

if (error.IsSet()) {

local_merge_result.set_error(error);

StartDone(ASSOCIATION_FAILED,