summaryrefslogtreecommitdiffstats
path: root/sync/syncable/entry_kernel.h
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/syncable/entry_kernel.h
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/syncable/entry_kernel.h')
-rw-r--r--sync/syncable/entry_kernel.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/sync/syncable/entry_kernel.h b/sync/syncable/entry_kernel.h
index 1954da4..383ffd7 100644
--- a/sync/syncable/entry_kernel.h
+++ b/sync/syncable/entry_kernel.h
@@ -216,8 +216,7 @@ struct EntryKernel {
// Round-trip to proto time format and back so that we have
// consistent time resolutions (ms).
time_fields[field - TIME_FIELDS_BEGIN] =
- syncer::ProtoTimeToTime(
- syncer::TimeToProtoTime(value));
+ ProtoTimeToTime(TimeToProtoTime(value));
}
inline void put(IdField field, const Id& value) {
id_fields[field - ID_FIELDS_BEGIN] = value;
@@ -290,7 +289,7 @@ struct EntryKernel {
return id_fields[field - ID_FIELDS_BEGIN];
}
- syncer::ModelType GetServerModelType() const;
+ ModelType GetServerModelType() const;
// Dumps all kernel info into a DictionaryValue and returns it.
// Transfers ownership of the DictionaryValue to the caller.
@@ -307,8 +306,7 @@ struct EntryKernelMutation {
typedef std::map<int64, EntryKernelMutation> EntryKernelMutationMap;
-typedef syncer::Immutable<EntryKernelMutationMap>
- ImmutableEntryKernelMutationMap;
+typedef Immutable<EntryKernelMutationMap> ImmutableEntryKernelMutationMap;
// Caller owns the return value.
base::DictionaryValue* EntryKernelMutationToValue(