summaryrefslogtreecommitdiffstats
path: root/sync/engine/syncer.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-02 22:54:17 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-02 22:54:17 +0000
commit9cfc7c708bd30750fd62a7072c22361e3e2a1189 (patch)
tree23b4c6a6b3be3ce1646b789985539c015b4d39b0 /sync/engine/syncer.h
parent73c2b16350cb33918a86bd035f033f34d4eb5504 (diff)
downloadchromium_src-9cfc7c708bd30750fd62a7072c22361e3e2a1189.zip
chromium_src-9cfc7c708bd30750fd62a7072c22361e3e2a1189.tar.gz
chromium_src-9cfc7c708bd30750fd62a7072c22361e3e2a1189.tar.bz2
[Sync] Move sync/{internal_api,syncable} into syncer namespace
Add temporary aliases from syncable::* to syncer::syncable::* for ModelType and related classes until those are ported to syncer proper. Disambiguate names in MockConnectionManager. BUG=128060 TEST= Review URL: https://chromiumcodereview.appspot.com/10699044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/syncer.h')
-rw-r--r--sync/engine/syncer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h
index 8369d80..18f9fd2 100644
--- a/sync/engine/syncer.h
+++ b/sync/engine/syncer.h
@@ -19,13 +19,13 @@
#include "sync/sessions/sync_session.h"
#include "sync/util/extensions_activity_monitor.h"
+namespace syncer {
+
namespace syncable {
class Entry;
class MutableEntry;
} // namespace syncable
-namespace syncer {
-
enum SyncerStep {
SYNCER_BEGIN,
CLEANUP_DISABLED_TYPES,