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

Unified Diff: components/sync/api/model_type_service.cc

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 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 | « components/sync/api/model_type_service.h ('k') | components/sync/api/model_type_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/api/model_type_service.cc
diff --git a/components/sync/api/model_type_service.cc b/components/sync/api/model_type_service.cc
index 90804c3b3e3a55f5ad55a3679f54584926c433d2..86e7d0c30c8df486ba78b95d4342a2d7c7e1dd89 100644
--- a/components/sync/api/model_type_service.cc
+++ b/components/sync/api/model_type_service.cc
@@ -6,11 +6,11 @@
#include <utility>
-namespace syncer_v2 {
+namespace syncer {
ModelTypeService::ModelTypeService(
const ChangeProcessorFactory& change_processor_factory,
- syncer::ModelType type)
+ ModelType type)
: change_processor_factory_(change_processor_factory), type_(type) {}
ModelTypeService::~ModelTypeService() {}
@@ -27,7 +27,7 @@ ConflictResolution ModelTypeService::ResolveConflict(
}
void ModelTypeService::OnSyncStarting(
- std::unique_ptr<syncer::DataTypeErrorHandler> error_handler,
+ std::unique_ptr<DataTypeErrorHandler> error_handler,
const ModelTypeChangeProcessor::StartCallback& start_callback) {
CreateChangeProcessor();
change_processor_->OnSyncStarting(std::move(error_handler), start_callback);
@@ -55,4 +55,4 @@ void ModelTypeService::clear_change_processor() {
change_processor_.reset();
}
-} // namespace syncer_v2
+} // namespace syncer
« no previous file with comments | « components/sync/api/model_type_service.h ('k') | components/sync/api/model_type_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698