| Index: components/sync/sessions_impl/sync_session.h
|
| diff --git a/sync/sessions/sync_session.h b/components/sync/sessions_impl/sync_session.h
|
| similarity index 84%
|
| rename from sync/sessions/sync_session.h
|
| rename to components/sync/sessions_impl/sync_session.h
|
| index 0763ea68ffbafe51c3ec73e7ffa817d1bb9e7ecf..10f0a310b2ca98d069c633a9673af1764d19068e 100644
|
| --- a/sync/sessions/sync_session.h
|
| +++ b/components/sync/sessions_impl/sync_session.h
|
| @@ -7,8 +7,8 @@
|
| // bundle throughout the sync cycle. The SyncSession is not reused across
|
| // sync cycles; each cycle starts with a new one.
|
|
|
| -#ifndef SYNC_SESSIONS_SYNC_SESSION_H_
|
| -#define SYNC_SESSIONS_SYNC_SESSION_H_
|
| +#ifndef COMPONENTS_SYNC_SESSIONS_IMPL_SYNC_SESSION_H_
|
| +#define COMPONENTS_SYNC_SESSIONS_IMPL_SYNC_SESSION_H_
|
|
|
| #include <map>
|
| #include <memory>
|
| @@ -19,14 +19,14 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/time/time.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/engine/sync_cycle_event.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/engine/model_safe_worker.h"
|
| -#include "sync/internal_api/public/sessions/sync_session_snapshot.h"
|
| -#include "sync/protocol/sync_protocol_error.h"
|
| -#include "sync/sessions/status_controller.h"
|
| -#include "sync/sessions/sync_session_context.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/engine/model_safe_worker.h"
|
| +#include "components/sync/engine_impl/sync_cycle_event.h"
|
| +#include "components/sync/protocol/sync_protocol_error.h"
|
| +#include "components/sync/sessions/sync_session_snapshot.h"
|
| +#include "components/sync/sessions_impl/status_controller.h"
|
| +#include "components/sync/sessions_impl/sync_session_context.h"
|
|
|
| namespace syncer {
|
| class ModelSafeWorker;
|
| @@ -48,9 +48,8 @@ class SYNC_EXPORT SyncSession {
|
| virtual void OnThrottled(const base::TimeDelta& throttle_duration) = 0;
|
|
|
| // Some of the client's types were throttled.
|
| - virtual void OnTypesThrottled(
|
| - ModelTypeSet types,
|
| - const base::TimeDelta& throttle_duration) = 0;
|
| + virtual void OnTypesThrottled(ModelTypeSet types,
|
| + const base::TimeDelta& throttle_duration) = 0;
|
|
|
| // Silenced intervals can be out of phase with individual sessions, so the
|
| // delegate is the only thing that can give an authoritative answer for
|
| @@ -95,8 +94,7 @@ class SYNC_EXPORT SyncSession {
|
|
|
| // Build a session without a nudge tracker. Used for poll or configure type
|
| // sync cycles.
|
| - static SyncSession* Build(SyncSessionContext* context,
|
| - Delegate* delegate);
|
| + static SyncSession* Build(SyncSessionContext* context, Delegate* delegate);
|
| ~SyncSession();
|
|
|
| // Builds a thread-safe and read-only copy of the current session state.
|
| @@ -140,4 +138,4 @@ class SYNC_EXPORT SyncSession {
|
| } // namespace sessions
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_SESSIONS_SYNC_SESSION_H_
|
| +#endif // COMPONENTS_SYNC_SESSIONS_IMPL_SYNC_SESSION_H_
|
|
|