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

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

Issue 408003002: [Sync] Fix namespace for sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 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/non_frontend_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
index 646ba2a6495074b35010dd0765413acf5e43ee19..d48a174d4c543feae7bddbf2ce9abb135233acbf 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
@@ -44,8 +44,8 @@ class NonFrontendDataTypeController::BackendComponentsContainer {
// For returning association results to controller on UI.
syncer::WeakHandle<NonFrontendDataTypeController> controller_handle_;
- scoped_ptr<AssociatorInterface> model_associator_;
- scoped_ptr<ChangeProcessor> change_processor_;
+ scoped_ptr<sync_driver::AssociatorInterface> model_associator_;
+ scoped_ptr<sync_driver::ChangeProcessor> change_processor_;
};
NonFrontendDataTypeController::
@@ -292,7 +292,8 @@ std::string NonFrontendDataTypeController::name() const {
return syncer::ModelTypeToString(type());
}
-DataTypeController::State NonFrontendDataTypeController::state() const {
+sync_driver::DataTypeController::State NonFrontendDataTypeController::state()
+ const {
return state_;
}
@@ -448,11 +449,13 @@ void NonFrontendDataTypeController::set_state(State state) {
state_ = state;
}
-AssociatorInterface* NonFrontendDataTypeController::associator() const {
+sync_driver::AssociatorInterface* NonFrontendDataTypeController::associator()
+ const {
return model_associator_;
}
-ChangeProcessor* NonFrontendDataTypeController::GetChangeProcessor() const {
+sync_driver::ChangeProcessor*
+NonFrontendDataTypeController::GetChangeProcessor() const {
return change_processor_;
}

Powered by Google App Engine
This is Rietveld 408576698