| Index: components/sync/sessions_impl/status_controller.h
|
| diff --git a/sync/sessions/status_controller.h b/components/sync/sessions_impl/status_controller.h
|
| similarity index 87%
|
| rename from sync/sessions/status_controller.h
|
| rename to components/sync/sessions_impl/status_controller.h
|
| index 4551dfd88dfa8749043b72fbd5f2a95af1846980..53bf8e6f143183ccdc2ee4607e18ea37a0043d8f 100644
|
| --- a/sync/sessions/status_controller.h
|
| +++ b/components/sync/sessions_impl/status_controller.h
|
| @@ -14,8 +14,8 @@
|
| // This object contains only global state. None of its members are per model
|
| // type counters.
|
|
|
| -#ifndef SYNC_SESSIONS_STATUS_CONTROLLER_H_
|
| -#define SYNC_SESSIONS_STATUS_CONTROLLER_H_
|
| +#ifndef COMPONENTS_SYNC_SESSIONS_IMPL_STATUS_CONTROLLER_H_
|
| +#define COMPONENTS_SYNC_SESSIONS_IMPL_STATUS_CONTROLLER_H_
|
|
|
| #include <map>
|
| #include <vector>
|
| @@ -24,9 +24,9 @@
|
| #include "base/macros.h"
|
| #include "base/stl_util.h"
|
| #include "base/time/time.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/engine/model_safe_worker.h"
|
| -#include "sync/internal_api/public/sessions/model_neutral_state.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/engine/model_safe_worker.h"
|
| +#include "components/sync/sessions/model_neutral_state.h"
|
|
|
| namespace syncer {
|
| namespace sessions {
|
| @@ -57,15 +57,11 @@ class SYNC_EXPORT StatusController {
|
| int num_local_overwrites() const;
|
|
|
| // The time at which we started the first sync cycle in this session.
|
| - base::Time sync_start_time() const {
|
| - return sync_start_time_;
|
| - }
|
| + base::Time sync_start_time() const { return sync_start_time_; }
|
|
|
| // If a poll was performed in this session, the time at which it finished.
|
| // Not set if no poll was performed.
|
| - base::Time poll_finish_time() const {
|
| - return poll_finish_time_;
|
| - }
|
| + base::Time poll_finish_time() const { return poll_finish_time_; }
|
|
|
| const ModelNeutralState& model_neutral_state() const {
|
| return model_neutral_;
|
| @@ -115,4 +111,4 @@ class SYNC_EXPORT StatusController {
|
| } // namespace sessions
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_SESSIONS_STATUS_CONTROLLER_H_
|
| +#endif // COMPONENTS_SYNC_SESSIONS_IMPL_STATUS_CONTROLLER_H_
|
|
|