summaryrefslogtreecommitdiffstats
path: root/sync/api/sync_error.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 17:25:41 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 17:25:41 +0000
commitd45f0d9764d93d8f89564a5df7fa505c6a87a6fe (patch)
tree89ce4ea823cf922e6955dafcfb275459589cef0a /sync/api/sync_error.cc
parent73e5d26041b0a22e16e383e84a8177930c9fd055 (diff)
downloadchromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.zip
chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.tar.gz
chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.tar.bz2
[Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings
Since (almost) everything in sync/ is now in the 'syncer' namespace, all of these are redundant. Clean up indentation. Put sync_{client,listen_notifications} into syncer namespace. BUG=128060 TEST= Review URL: https://chromiumcodereview.appspot.com/10795018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/api/sync_error.cc')
-rw-r--r--sync/api/sync_error.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/sync/api/sync_error.cc b/sync/api/sync_error.cc
index 307f339..1209040 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,
- syncer::ModelType type) {
+ 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_ = syncer::UNSPECIFIED;
+ type_ = UNSPECIFIED;
}
void SyncError::Reset(const tracked_objects::Location& location,
const std::string& message,
- syncer::ModelType type) {
+ ModelType type) {
Init(location, message, type);
PrintLogError();
}
void SyncError::Init(const tracked_objects::Location& location,
const std::string& message,
- syncer::ModelType type) {
+ 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_;
}
-syncer::ModelType SyncError::type() const {
+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() + ", " + syncer::ModelTypeToString(type_) +
+ return location_->ToString() + ", " + ModelTypeToString(type_) +
", Sync Error: " + message_;
}
@@ -102,7 +102,7 @@ void SyncError::PrintLogError() const {
location_->line_number(),
logging::LOG_ERROR).stream(),
LOG_IS_ON(ERROR))
- << syncer::ModelTypeToString(type_) << ", Sync Error: " << message_;
+ << ModelTypeToString(type_) << ", Sync Error: " << message_;
}
void PrintTo(const SyncError& sync_error, std::ostream* os) {