chrome/browser/sync/glue/search_engine_data_type_controller.cc - Issue 8274020: Revert 105404 - [Sync] Refactor non-frontend DTC to handle new API properly.

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

Issue 8274020: Revert 105404 - [Sync] Refactor non-frontend DTC to handle new API properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 2 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/sync/glue/search_engine_data_type_controller.h ('k') | chrome/browser/sync/glue/shared_change_processor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- chrome/browser/sync/glue/search_engine_data_type_controller.cc (revision 105407)

+++ chrome/browser/sync/glue/search_engine_data_type_controller.cc (working copy)

@@ -9,6 +9,7 @@

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

#include "chrome/browser/sync/api/syncable_service.h"

+#include "chrome/browser/sync/glue/generic_change_processor.h"

#include "chrome/browser/sync/profile_sync_factory.h"

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/common/chrome_notification_types.h"

@@ -69,15 +70,9 @@

profile_sync_factory_->CreateSearchEngineSyncComponents(sync_service_,

this);

set_model_associator(sync_components.model_associator);

- generic_change_processor_.reset(static_cast<GenericChangeProcessor*>(

- sync_components.change_processor));

+ set_change_processor(sync_components.change_processor);

}

-GenericChangeProcessor* SearchEngineDataTypeController::change_processor()

- const {

- return generic_change_processor_.get();

void SearchEngineDataTypeController::RecordUnrecoverableError(

const tracked_objects::Location& from_here,

const std::string& message) {