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

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

Issue 2258873003: [Sync] Move sessions/ to engine/cycle/ and rename things to match. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 4 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/get_commit_ids.cc ('k') | components/sync/engine_impl/get_updates_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/engine_impl/get_updates_delegate.h
diff --git a/components/sync/engine_impl/get_updates_delegate.h b/components/sync/engine_impl/get_updates_delegate.h
index cad65dc9f0a8b74406f7a763d367bc30590b6c62..9ab2ba84543dd0bbcd443db22ce32b16b8dfdd9a 100644
--- a/components/sync/engine_impl/get_updates_delegate.h
+++ b/components/sync/engine_impl/get_updates_delegate.h
@@ -9,10 +9,10 @@
#include "base/macros.h"
#include "components/sync/engine/events/protocol_event.h"
+#include "components/sync/engine_impl/cycle/nudge_tracker.h"
+#include "components/sync/engine_impl/cycle/status_controller.h"
#include "components/sync/engine_impl/model_type_registry.h"
#include "components/sync/protocol/sync.pb.h"
-#include "components/sync/sessions_impl/nudge_tracker.h"
-#include "components/sync/sessions_impl/status_controller.h"
namespace syncer {
@@ -33,7 +33,7 @@ class GetUpdatesDelegate {
// Applies pending updates to non-control types.
virtual void ApplyUpdates(ModelTypeSet gu_types,
- sessions::StatusController* status,
+ StatusController* status,
UpdateHandlerMap* update_handler_map) const = 0;
virtual std::unique_ptr<ProtocolEvent> GetNetworkRequestEvent(
@@ -44,8 +44,7 @@ class GetUpdatesDelegate {
// Functionality specific to the normal GetUpdate request.
class NormalGetUpdatesDelegate : public GetUpdatesDelegate {
public:
- explicit NormalGetUpdatesDelegate(
- const sessions::NudgeTracker& nudge_tracker);
+ explicit NormalGetUpdatesDelegate(const NudgeTracker& nudge_tracker);
~NormalGetUpdatesDelegate() override;
// Uses the member NudgeTracker to populate some fields of this GU message.
@@ -54,7 +53,7 @@ class NormalGetUpdatesDelegate : public GetUpdatesDelegate {
// Applies pending updates on the appropriate data type threads.
void ApplyUpdates(ModelTypeSet gu_types,
- sessions::StatusController* status,
+ StatusController* status,
UpdateHandlerMap* update_handler_map) const override;
std::unique_ptr<ProtocolEvent> GetNetworkRequestEvent(
@@ -62,7 +61,7 @@ class NormalGetUpdatesDelegate : public GetUpdatesDelegate {
const sync_pb::ClientToServerMessage& request) const override;
private:
- const sessions::NudgeTracker& nudge_tracker_;
+ const NudgeTracker& nudge_tracker_;
DISALLOW_COPY_AND_ASSIGN(NormalGetUpdatesDelegate);
};
@@ -83,7 +82,7 @@ class ConfigureGetUpdatesDelegate : public GetUpdatesDelegate {
// This is safe only if the ChangeProcessor is not listening to changes at
// this time.
void ApplyUpdates(ModelTypeSet gu_types,
- sessions::StatusController* status,
+ StatusController* status,
UpdateHandlerMap* update_handler_map) const override;
std::unique_ptr<ProtocolEvent> GetNetworkRequestEvent(
@@ -111,7 +110,7 @@ class PollGetUpdatesDelegate : public GetUpdatesDelegate {
// Applies updates on the appropriate data type thread.
void ApplyUpdates(ModelTypeSet gu_types,
- sessions::StatusController* status,
+ StatusController* status,
UpdateHandlerMap* update_handler_map) const override;
std::unique_ptr<ProtocolEvent> GetNetworkRequestEvent(
« no previous file with comments | « components/sync/engine_impl/get_commit_ids.cc ('k') | components/sync/engine_impl/get_updates_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698