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/js_sync_manager_observer.cc | |
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/js_sync_manager_observer.cc')
-rw-r--r-- | sync/internal_api/js_sync_manager_observer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc index 70b4e48..8a9889b 100644 --- a/sync/internal_api/js_sync_manager_observer.cc +++ b/sync/internal_api/js_sync_manager_observer.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/values.h" +#include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/change_record.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" -#include "sync/internal_api/public/syncable/model_type.h" #include "sync/js/js_arg_list.h" #include "sync/js/js_event_details.h" #include "sync/js/js_event_handler.h" |