summaryrefslogtreecommitdiffstats
path: root/sync/syncable/entry_kernel.cc
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/syncable/entry_kernel.cc
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/syncable/entry_kernel.cc')
-rw-r--r--sync/syncable/entry_kernel.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sync/syncable/entry_kernel.cc b/sync/syncable/entry_kernel.cc
index 99511d9..28b6b0f 100644
--- a/sync/syncable/entry_kernel.cc
+++ b/sync/syncable/entry_kernel.cc
@@ -8,6 +8,7 @@
#include "sync/protocol/proto_value_conversions.h"
#include "sync/syncable/syncable_enum_conversions.h"
+namespace syncer {
namespace syncable {
EntryKernel::EntryKernel() : dirty_(false) {
@@ -148,4 +149,5 @@ DictionaryValue* EntryKernelMutationToValue(
return dict;
}
-}
+} // namespace syncer
+} // namespace syncable