| Index: components/sync/engine/events/normal_get_updates_request_event.cc
|
| diff --git a/sync/internal_api/events/normal_get_updates_request_event.cc b/components/sync/engine/events/normal_get_updates_request_event.cc
|
| similarity index 57%
|
| rename from sync/internal_api/events/normal_get_updates_request_event.cc
|
| rename to components/sync/engine/events/normal_get_updates_request_event.cc
|
| index e58bb2f8200fac03a152e59d07f2843086bf70f2..12a9664512800d60e09aaa24e8c1ac2d27a31561 100644
|
| --- a/sync/internal_api/events/normal_get_updates_request_event.cc
|
| +++ b/components/sync/engine/events/normal_get_updates_request_event.cc
|
| @@ -2,24 +2,24 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/internal_api/public/events/normal_get_updates_request_event.h"
|
| +#include "components/sync/engine/events/normal_get_updates_request_event.h"
|
|
|
| #include "base/strings/stringprintf.h"
|
| -#include "sync/protocol/proto_value_conversions.h"
|
| -#include "sync/sessions/nudge_tracker.h"
|
| +#include "components/sync/protocol/proto_value_conversions.h"
|
| +#include "components/sync/sessions_impl/nudge_tracker.h"
|
|
|
| namespace syncer {
|
|
|
| NormalGetUpdatesRequestEvent::NormalGetUpdatesRequestEvent(
|
| - base::Time timestamp,
|
| - const sessions::NudgeTracker& nudge_tracker,
|
| - const sync_pb::ClientToServerMessage& request)
|
| - : timestamp_(timestamp),
|
| - nudged_types_(nudge_tracker.GetNudgedTypes()),
|
| - notified_types_(nudge_tracker.GetNotifiedTypes()),
|
| - refresh_requested_types_(nudge_tracker.GetRefreshRequestedTypes()),
|
| - is_retry_(nudge_tracker.IsRetryRequired()),
|
| - request_(request) { }
|
| + base::Time timestamp,
|
| + const sessions::NudgeTracker& nudge_tracker,
|
| + const sync_pb::ClientToServerMessage& request)
|
| + : timestamp_(timestamp),
|
| + nudged_types_(nudge_tracker.GetNudgedTypes()),
|
| + notified_types_(nudge_tracker.GetNotifiedTypes()),
|
| + refresh_requested_types_(nudge_tracker.GetRefreshRequestedTypes()),
|
| + is_retry_(nudge_tracker.IsRetryRequired()),
|
| + request_(request) {}
|
|
|
| NormalGetUpdatesRequestEvent::~NormalGetUpdatesRequestEvent() {}
|
|
|
| @@ -38,24 +38,22 @@ std::string NormalGetUpdatesRequestEvent::GetDetails() const {
|
| if (!details.empty())
|
| details.append("\n");
|
| details.append(base::StringPrintf(
|
| - "Nudged types: %s",
|
| - ModelTypeSetToString(nudged_types_).c_str()));
|
| + "Nudged types: %s", ModelTypeSetToString(nudged_types_).c_str()));
|
| }
|
|
|
| if (!notified_types_.Empty()) {
|
| if (!details.empty())
|
| details.append("\n");
|
| details.append(base::StringPrintf(
|
| - "Notified types: %s",
|
| - ModelTypeSetToString(notified_types_).c_str()));
|
| + "Notified types: %s", ModelTypeSetToString(notified_types_).c_str()));
|
| }
|
|
|
| if (!refresh_requested_types_.Empty()) {
|
| if (!details.empty())
|
| details.append("\n");
|
| details.append(base::StringPrintf(
|
| - "Refresh requested types: %s",
|
| - ModelTypeSetToString(refresh_requested_types_).c_str()));
|
| + "Refresh requested types: %s",
|
| + ModelTypeSetToString(refresh_requested_types_).c_str()));
|
| }
|
|
|
| if (is_retry_) {
|
| @@ -80,17 +78,17 @@ std::unique_ptr<ProtocolEvent> NormalGetUpdatesRequestEvent::Clone() const {
|
| }
|
|
|
| NormalGetUpdatesRequestEvent::NormalGetUpdatesRequestEvent(
|
| - base::Time timestamp,
|
| - ModelTypeSet nudged_types,
|
| - ModelTypeSet notified_types,
|
| - ModelTypeSet refresh_requested_types,
|
| - bool is_retry,
|
| - sync_pb::ClientToServerMessage request)
|
| - : timestamp_(timestamp),
|
| - nudged_types_(nudged_types),
|
| - notified_types_(notified_types),
|
| - refresh_requested_types_(refresh_requested_types),
|
| - is_retry_(is_retry),
|
| - request_(request) {}
|
| + base::Time timestamp,
|
| + ModelTypeSet nudged_types,
|
| + ModelTypeSet notified_types,
|
| + ModelTypeSet refresh_requested_types,
|
| + bool is_retry,
|
| + sync_pb::ClientToServerMessage request)
|
| + : timestamp_(timestamp),
|
| + nudged_types_(nudged_types),
|
| + notified_types_(notified_types),
|
| + refresh_requested_types_(refresh_requested_types),
|
| + is_retry_(is_retry),
|
| + request_(request) {}
|
|
|
| } // namespace syncer
|
|
|