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

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

Issue 7511004: [Sync] Refactor data type configuration/activation/deactivation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests, address comments Created 9 years, 4 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/frontend_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc
index 6d997873011f481afcc0ca5f600e42864086f2aa..aac04d8ab41f7610449cc83bff0b3b517f520637 100644
--- a/chrome/browser/sync/glue/frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc
@@ -101,7 +101,8 @@ bool FrontendDataTypeController::Associate() {
return false;
}
- sync_service_->ActivateDataType(this, change_processor_.get());
+ sync_service_->ActivateDataType(type(), model_safe_group(),
+ change_processor_.get());
state_ = RUNNING;
FinishStart(!sync_has_nodes ? OK_FIRST_RUN : OK, FROM_HERE);
return true;
@@ -151,8 +152,7 @@ void FrontendDataTypeController::Stop() {
CleanUpState();
- if (change_processor_.get())
- sync_service_->DeactivateDataType(this, change_processor_.get());
+ sync_service_->DeactivateDataType(type());
if (model_associator()) {
SyncError error;

Powered by Google App Engine
This is Rietveld 408576698