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/conflict_resolver.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/conflict_resolver.h')
| -rw-r--r-- | sync/engine/conflict_resolver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h index 733348c..e0fce1d 100644 --- a/sync/engine/conflict_resolver.h +++ b/sync/engine/conflict_resolver.h @@ -17,6 +17,8 @@ #include "base/gtest_prod_util.h" #include "sync/engine/syncer_types.h" +namespace syncer { + namespace syncable { class BaseTransaction; class Id; @@ -24,8 +26,6 @@ class MutableEntry; class WriteTransaction; } // namespace syncable -namespace syncer { - class Cryptographer; namespace sessions { |