summaryrefslogtreecommitdiffstats
path: root/components/sync_driver/model_associator.h
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-22 23:26:47 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-22 23:26:47 +0000
commit49fef7948a95e3f3d81302d96f200b1dfbddd9e3 (patch)
tree12e20e3dc919ede7672fbcabe4844453bf056a49 /components/sync_driver/model_associator.h
parent076acafe6160dc1365289838078403554e5be85d (diff)
downloadchromium_src-49fef7948a95e3f3d81302d96f200b1dfbddd9e3.zip
chromium_src-49fef7948a95e3f3d81302d96f200b1dfbddd9e3.tar.gz
chromium_src-49fef7948a95e3f3d81302d96f200b1dfbddd9e3.tar.bz2
[Sync] Fix namespace for sync_driver component
browser_sync namespace was still in use while transitions were being made. We're far enough along now that it's worth moving to the sync_driver namespace. BUG=339728 TBR=bauerb@chromium.org Review URL: https://codereview.chromium.org/408003002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/sync_driver/model_associator.h')
-rw-r--r--components/sync_driver/model_associator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/sync_driver/model_associator.h b/components/sync_driver/model_associator.h
index b7ec7b6..0bc6d7a 100644
--- a/components/sync_driver/model_associator.h
+++ b/components/sync_driver/model_associator.h
@@ -15,7 +15,7 @@ class BaseNode;
class SyncMergeResult;
}
-namespace browser_sync {
+namespace sync_driver {
// This represents the fundamental operations used for model association that
// are common to all ModelAssociators and do not depend on types of the models
@@ -90,6 +90,6 @@ class PerDataTypeAssociatorInterface : public AssociatorInterface {
virtual void Disassociate(int64 sync_id) = 0;
};
-} // namespace browser_sync
+} // namespace sync_driver
#endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_H_