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

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

Issue 1314903004: Sync: Refactoring DataTypeController to make the design shareable with USS datatypes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed CR comments Created 5 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/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 584a4c3108eb7a3626f0713f35e636276a9e1e08..b213c096e668c3901bbf7a3560c4572e408e6b4b 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
@@ -157,10 +157,10 @@ NonFrontendDataTypeController::AssociationResult::AssociationResult(
NonFrontendDataTypeController::AssociationResult::~AssociationResult() {}
NonFrontendDataTypeController::NonFrontendDataTypeController(
- scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
+ const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
const base::Closure& error_callback,
sync_driver::SyncClient* sync_client)
- : DataTypeController(ui_thread, error_callback),
+ : DirectoryDataTypeController(ui_thread, error_callback),
state_(NOT_RUNNING),
sync_client_(sync_client),
model_associator_(NULL),
@@ -293,13 +293,13 @@ void NonFrontendDataTypeController::OnSingleDataTypeUnrecoverableError(
}
NonFrontendDataTypeController::NonFrontendDataTypeController()
- : DataTypeController(base::ThreadTaskRunnerHandle::Get(), base::Closure()),
+ : DirectoryDataTypeController(base::ThreadTaskRunnerHandle::Get(),
+ base::Closure()),
state_(NOT_RUNNING),
sync_client_(NULL),
model_associator_(NULL),
change_processor_(NULL),
- weak_ptr_factory_(this) {
-}
+ weak_ptr_factory_(this) {}
NonFrontendDataTypeController::~NonFrontendDataTypeController() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);

Powered by Google App Engine
This is Rietveld 408576698