| Index: components/sync/engine_impl/all_status.h
|
| diff --git a/sync/engine/all_status.h b/components/sync/engine_impl/all_status.h
|
| similarity index 87%
|
| rename from sync/engine/all_status.h
|
| rename to components/sync/engine_impl/all_status.h
|
| index 1fc0801c8204e973b7352b615263097abf12092d..fa4564dc2417ff9c7fd735a01213c19a90fd08f3 100644
|
| --- a/sync/engine/all_status.h
|
| +++ b/components/sync/engine_impl/all_status.h
|
| @@ -5,8 +5,8 @@
|
| // The AllStatus object watches various sync engine components and aggregates
|
| // the status of all of them into one place.
|
|
|
| -#ifndef SYNC_ENGINE_ALL_STATUS_H_
|
| -#define SYNC_ENGINE_ALL_STATUS_H_
|
| +#ifndef COMPONENTS_SYNC_ENGINE_IMPL_ALL_STATUS_H_
|
| +#define COMPONENTS_SYNC_ENGINE_IMPL_ALL_STATUS_H_
|
|
|
| #include <map>
|
| #include <string>
|
| @@ -14,11 +14,11 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "sync/engine/nudge_source.h"
|
| -#include "sync/engine/sync_engine_event_listener.h"
|
| -#include "sync/engine/syncer_types.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/engine/sync_status.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/engine/sync_status.h"
|
| +#include "components/sync/engine_impl/nudge_source.h"
|
| +#include "components/sync/engine_impl/sync_engine_event_listener.h"
|
| +#include "components/sync/engine_impl/syncer_types.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -88,10 +88,11 @@ class ScopedStatusLock {
|
| public:
|
| explicit ScopedStatusLock(AllStatus* allstatus);
|
| ~ScopedStatusLock();
|
| +
|
| protected:
|
| AllStatus* allstatus_;
|
| };
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_ENGINE_ALL_STATUS_H_
|
| +#endif // COMPONENTS_SYNC_ENGINE_IMPL_ALL_STATUS_H_
|
|
|