diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 22:54:17 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 22:54:17 +0000 |
commit | 9cfc7c708bd30750fd62a7072c22361e3e2a1189 (patch) | |
tree | 23b4c6a6b3be3ce1646b789985539c015b4d39b0 /sync/engine/update_applicator.h | |
parent | 73c2b16350cb33918a86bd035f033f34d4eb5504 (diff) | |
download | chromium_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/update_applicator.h')
-rw-r--r-- | sync/engine/update_applicator.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sync/engine/update_applicator.h b/sync/engine/update_applicator.h index de05999..ea16fa2 100644 --- a/sync/engine/update_applicator.h +++ b/sync/engine/update_applicator.h @@ -19,11 +19,6 @@ #include "sync/internal_api/public/engine/model_safe_worker.h" #include "sync/syncable/syncable_id.h" -namespace syncable { -class WriteTransaction; -class Entry; -} - namespace syncer { namespace sessions { @@ -31,6 +26,11 @@ class ConflictProgress; class UpdateProgress; } +namespace syncable { +class WriteTransaction; +class Entry; +} + class ConflictResolver; class Cryptographer; |