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

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

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 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/data_type_controller.cc
diff --git a/chrome/browser/sync/glue/data_type_controller.cc b/chrome/browser/sync/glue/data_type_controller.cc
index 218e717137ed9c712fd2a4e96bc85eaeca6bdc6f..b7fc7c34cf48c1f223c1b848d4a00d42d650e024 100644
--- a/chrome/browser/sync/glue/data_type_controller.cc
+++ b/chrome/browser/sync/glue/data_type_controller.cc
@@ -16,10 +16,10 @@ bool DataTypeController::IsUnrecoverableResult(StartResult result) {
syncer::SyncError DataTypeController::CreateAndUploadError(
const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type) {
+ syncer::ModelType type) {
// TODO(sync): remove this once search engines triggers less errors, such as
// due to crbug.com/130448.
- if (type != syncable::SEARCH_ENGINES)
+ if (type != syncer::SEARCH_ENGINES)
ChromeReportUnrecoverableError();
return syncer::SyncError(location, message, type);
}
@@ -32,11 +32,11 @@ void DataTypeController::RecordUnrecoverableError(
<< message << " at location "
<< from_here.ToString();
UMA_HISTOGRAM_ENUMERATION("Sync.DataTypeRunFailures", type(),
- syncable::MODEL_TYPE_COUNT);
+ syncer::MODEL_TYPE_COUNT);
// TODO(sync): remove this once search engines triggers less errors, such as
// due to crbug.com/130448.
- if (type() != syncable::SEARCH_ENGINES)
+ if (type() != syncer::SEARCH_ENGINES)
ChromeReportUnrecoverableError();
}
« no previous file with comments | « chrome/browser/sync/glue/data_type_controller.h ('k') | chrome/browser/sync/glue/data_type_controller_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698