summaryrefslogtreecommitdiffstats
path: root/sync/api/sync_error.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-03 23:41:32 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-03 23:41:32 +0000
commita4a1476522880f416690e9357eedaa40b5ac8a99 (patch)
treebc2a8cc0a4942e16094f9a07859508583b03e169 /sync/api/sync_error.h
parentdade34b60910f213ae8f8fdd13709ec17581ef9e (diff)
downloadchromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.zip
chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.gz
chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.bz2
[Sync] Move ModelType and related classes to 'syncer' namespace
Previously they were in 'syncer::syncable'. Also remove aliases to those classes from 'syncable'. BUG=128060 TEST= TBR=pkasting@chromium.org,jhawkins@chromium.org, Review URL: https://chromiumcodereview.appspot.com/10696087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/api/sync_error.h')
-rw-r--r--sync/api/sync_error.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sync/api/sync_error.h b/sync/api/sync_error.h
index 0e3a3c9..657c17d 100644
--- a/sync/api/sync_error.h
+++ b/sync/api/sync_error.h
@@ -33,7 +33,7 @@ class SyncError {
// Will print the new error to LOG(ERROR).
SyncError(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type);
+ syncer::ModelType type);
// Copy and assign via deep copy.
SyncError(const SyncError& other);
@@ -46,7 +46,7 @@ class SyncError {
// Will print the new error to LOG(ERROR).
void Reset(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type);
+ syncer::ModelType type);
// Whether this is a valid error or not.
bool IsSet() const;
@@ -54,7 +54,7 @@ class SyncError {
// These must only be called if IsSet() is true.
const tracked_objects::Location& location() const;
const std::string& message() const;
- syncable::ModelType type() const;
+ syncer::ModelType type() const;
// Returns empty string is IsSet() is false.
std::string ToString() const;
@@ -70,7 +70,7 @@ class SyncError {
// is called, IsSet() will return true.
void Init(const tracked_objects::Location& location,
const std::string& message,
- syncable::ModelType type);
+ syncer::ModelType type);
// Reset the error to it's default (unset) values.
void Clear();
@@ -78,7 +78,7 @@ class SyncError {
// scoped_ptr is necessary because Location objects aren't assignable.
scoped_ptr<tracked_objects::Location> location_;
std::string message_;
- syncable::ModelType type_;
+ syncer::ModelType type_;
};
// gmock printer helper.