diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 01:30:56 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 01:30:56 +0000 |
| commit | 002d391999fbbd290c9189056cd6262f827b825a (patch) | |
| tree | bc400541b7c8e1b5833748f454b35f78e0f7ce9d /sync/internal_api/public/sessions | |
| parent | 2f30fff337549f07694b3ed02267f5f747a587aa (diff) | |
| download | chromium_src-002d391999fbbd290c9189056cd6262f827b825a.zip chromium_src-002d391999fbbd290c9189056cd6262f827b825a.tar.gz chromium_src-002d391999fbbd290c9189056cd6262f827b825a.tar.bz2 | |
[Sync] Move model_type* from syncable/ to base/
Also move enum_set* to base/.
This is the first step in moving ModelType et al. to the syncer
namespace (from syncer::syncable).
Move PurgeStalePayload() back to sync_session.cc.
Move ModelTypePayloadMapFromRoutingInfo() to model_safe_worker.* and rename it to ModelSafeRoutingInfoToPayloadMap().
BUG=128060
TEST=
Review URL: https://chromiumcodereview.appspot.com/10690071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public/sessions')
3 files changed, 5 insertions, 4 deletions
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc index 74fba25..4427236 100644 --- a/sync/internal_api/public/sessions/sync_session_snapshot.cc +++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc @@ -5,6 +5,7 @@ #include "sync/internal_api/public/sessions/sync_session_snapshot.h" #include "base/json/json_writer.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" namespace syncer { diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.h b/sync/internal_api/public/sessions/sync_session_snapshot.h index 9029132..2363878 100644 --- a/sync/internal_api/public/sessions/sync_session_snapshot.h +++ b/sync/internal_api/public/sessions/sync_session_snapshot.h @@ -10,10 +10,10 @@ #include "base/basictypes.h" #include "base/time.h" +#include "sync/internal_api/public/base/model_type.h" +#include "sync/internal_api/public/base/model_type_payload_map.h" #include "sync/internal_api/public/sessions/model_neutral_state.h" #include "sync/internal_api/public/sessions/sync_source_info.h" -#include "sync/internal_api/public/syncable/model_type.h" -#include "sync/internal_api/public/syncable/model_type_payload_map.h" namespace base { class DictionaryValue; diff --git a/sync/internal_api/public/sessions/sync_source_info.h b/sync/internal_api/public/sessions/sync_source_info.h index 6902b26..6505411 100644 --- a/sync/internal_api/public/sessions/sync_source_info.h +++ b/sync/internal_api/public/sessions/sync_source_info.h @@ -7,8 +7,8 @@ #pragma once #include "base/basictypes.h" -#include "sync/internal_api/public/syncable/model_type.h" -#include "sync/internal_api/public/syncable/model_type_payload_map.h" +#include "sync/internal_api/public/base/model_type.h" +#include "sync/internal_api/public/base/model_type_payload_map.h" #include "sync/protocol/sync.pb.h" namespace base { |