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

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

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: 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/data_type_error_handler_impl.h ('k') | components/sync/api/entity_change.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/api/data_type_error_handler_impl.cc
diff --git a/components/sync/api/data_type_error_handler_impl.cc b/components/sync/api/data_type_error_handler_impl.cc
index e856cc12d11115cb3af548e3c8b3ca7e678f1dab..0cfb1f327e640dfb5c81494a5f0a13e3b6b9e75c 100644
--- a/components/sync/api/data_type_error_handler_impl.cc
+++ b/components/sync/api/data_type_error_handler_impl.cc
@@ -24,17 +24,18 @@ void DataTypeErrorHandlerImpl::OnUnrecoverableError(const SyncError& error) {
dump_stack_.Run();
UMA_HISTOGRAM_ENUMERATION("Sync.DataTypeRunFailures",
ModelTypeToHistogramInt(error.model_type()),
- MODEL_TYPE_COUNT);
+ syncer::MODEL_TYPE_COUNT);
ui_thread_->PostTask(error.location(), base::Bind(sync_callback_, error));
}
-SyncError DataTypeErrorHandlerImpl::CreateAndUploadError(
+syncer::SyncError DataTypeErrorHandlerImpl::CreateAndUploadError(
const tracked_objects::Location& location,
const std::string& message,
- ModelType type) {
+ syncer::ModelType type) {
if (!dump_stack_.is_null())
dump_stack_.Run();
- return SyncError(location, SyncError::DATATYPE_ERROR, message, type);
+ return syncer::SyncError(location, syncer::SyncError::DATATYPE_ERROR, message,
+ type);
}
std::unique_ptr<DataTypeErrorHandler> DataTypeErrorHandlerImpl::Copy() const {
« no previous file with comments | « components/sync/api/data_type_error_handler_impl.h ('k') | components/sync/api/entity_change.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698