chrome/browser/sync/glue/bookmark_data_type_controller.cc - Issue 6905044: Refactor preference syncing.

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/bookmark_data_type_controller.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix the previous fix Created 9 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:

Index: chrome/browser/sync/glue/bookmark_data_type_controller.cc

diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.cc b/chrome/browser/sync/glue/bookmark_data_type_controller.cc

index 4415240e2ac92c89e940f025f13f3ecc4f8fa3b4..083f50c60aa4cb612f49f66b892bf01e09f19ee8 100644

--- a/chrome/browser/sync/glue/bookmark_data_type_controller.cc

+++ b/chrome/browser/sync/glue/bookmark_data_type_controller.cc

@@ -65,7 +65,8 @@ syncable::ModelType BookmarkDataTypeController::type() const {

void BookmarkDataTypeController::CreateSyncComponents() {

ProfileSyncFactory::SyncComponents sync_components = profile_sync_factory_->

CreateBookmarkSyncComponents(sync_service_, this);

- model_associator_.reset(sync_components.model_associator);

+ model_associator_ = reinterpret_cast<NewAssociatorInterface*>(

+ sync_components.model_associator);

change_processor_.reset(sync_components.change_processor);

}