summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/public/engine/model_safe_worker.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/internal_api/public/engine/model_safe_worker.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/internal_api/public/engine/model_safe_worker.h')
-rw-r--r--sync/internal_api/public/engine/model_safe_worker.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/sync/internal_api/public/engine/model_safe_worker.h b/sync/internal_api/public/engine/model_safe_worker.h
index 9f1c702..d67f4b6 100644
--- a/sync/internal_api/public/engine/model_safe_worker.h
+++ b/sync/internal_api/public/engine/model_safe_worker.h
@@ -68,11 +68,10 @@ class SYNC_EXPORT ModelSafeWorker
friend class base::RefCountedThreadSafe<ModelSafeWorker>;
};
-// A map that details which ModelSafeGroup each syncer::ModelType
+// A map that details which ModelSafeGroup each ModelType
// belongs to. Routing info can change in response to the user enabling /
// disabling sync for certain types, as well as model association completions.
-typedef std::map<syncer::ModelType, ModelSafeGroup>
- ModelSafeRoutingInfo;
+typedef std::map<ModelType, ModelSafeGroup> ModelSafeRoutingInfo;
// Caller takes ownership of return value.
base::DictionaryValue* ModelSafeRoutingInfoToValue(
@@ -83,15 +82,15 @@ SYNC_EXPORT std::string ModelSafeRoutingInfoToString(
// Make a ModelTypePayloadMap for all the enabled types in a
// ModelSafeRoutingInfo using a default payload.
-syncer::ModelTypePayloadMap ModelSafeRoutingInfoToPayloadMap(
+ModelTypePayloadMap ModelSafeRoutingInfoToPayloadMap(
const ModelSafeRoutingInfo& routes,
const std::string& payload);
-SYNC_EXPORT syncer::ModelTypeSet GetRoutingInfoTypes(
+SYNC_EXPORT ModelTypeSet GetRoutingInfoTypes(
const ModelSafeRoutingInfo& routing_info);
SYNC_EXPORT ModelSafeGroup GetGroupForModelType(
- const syncer::ModelType type,
+ const ModelType type,
const ModelSafeRoutingInfo& routes);
} // namespace syncer