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

Unified Diff: sync/api/sync_error.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
« no previous file with comments | « sync/api/sync_error.h ('k') | sync/api/sync_error_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/api/sync_error.cc
diff --git a/sync/api/sync_error.cc b/sync/api/sync_error.cc
index be2a457d98b7353ed320de3a14b1c6cc67d5b37c..307f3393974e150b931ec7b8c0d5b512cb76773c 100644
--- a/sync/api/sync_error.cc
+++ b/sync/api/sync_error.cc
@@ -18,7 +18,7 @@ SyncError::SyncError() {
SyncError::SyncError(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type) {
+ syncer::ModelType type) {
Init(location, message, type);
PrintLogError();
}
@@ -51,19 +51,19 @@ void SyncError::Copy(const SyncError& other) {
void SyncError::Clear() {
location_.reset();
message_ = std::string();
- type_ = syncable::UNSPECIFIED;
+ type_ = syncer::UNSPECIFIED;
}
void SyncError::Reset(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type) {
+ syncer::ModelType type) {
Init(location, message, type);
PrintLogError();
}
void SyncError::Init(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type) {
+ syncer::ModelType type) {
location_.reset(new tracked_objects::Location(location));
message_ = message;
type_ = type;
@@ -84,7 +84,7 @@ const std::string& SyncError::message() const {
return message_;
}
-syncable::ModelType SyncError::type() const {
+syncer::ModelType SyncError::type() const {
CHECK(IsSet());
return type_;
}
@@ -93,7 +93,7 @@ std::string SyncError::ToString() const {
if (!IsSet()) {
return std::string();
}
- return location_->ToString() + ", " + syncable::ModelTypeToString(type_) +
+ return location_->ToString() + ", " + syncer::ModelTypeToString(type_) +
", Sync Error: " + message_;
}
@@ -102,7 +102,7 @@ void SyncError::PrintLogError() const {
location_->line_number(),
logging::LOG_ERROR).stream(),
LOG_IS_ON(ERROR))
- << syncable::ModelTypeToString(type_) << ", Sync Error: " << message_;
+ << syncer::ModelTypeToString(type_) << ", Sync Error: " << message_;
}
void PrintTo(const SyncError& sync_error, std::ostream* os) {
« no previous file with comments | « sync/api/sync_error.h ('k') | sync/api/sync_error_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698