Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1101)

Unified Diff: components/sync/engine_impl/all_status.h

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/engine_impl/DEPS ('k') | components/sync/engine_impl/all_status.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« no previous file with comments | « components/sync/engine_impl/DEPS ('k') | components/sync/engine_impl/all_status.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698