content/browser/background_sync/background_sync_registration.h - Issue 1960843002: [OnionSoup] Move background_sync.mojom from //content to //third_party/WebKit

Unified Diff: content/browser/background_sync/background_sync_registration.h

Issue 1960843002: [OnionSoup] Move background_sync.mojom from //content to //third_party/WebKit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: added security owners for service_worker_event_status.mojom file Created 4 years, 7 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 | « content/browser/background_sync/background_sync_manager_unittest.cc ('k') | content/browser/background_sync/background_sync_registration.cc » ('j') | third_party/WebKit/public/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/background_sync/background_sync_registration.h

diff --git a/content/browser/background_sync/background_sync_registration.h b/content/browser/background_sync/background_sync_registration.h

index 684370dbfde6456af66a5cb4f2164a5fd0ab7e32..a937d91ab333ec3ca9e59a37fdd84d9577dc6feb 100644

--- a/content/browser/background_sync/background_sync_registration.h

+++ b/content/browser/background_sync/background_sync_registration.h

@@ -15,9 +15,9 @@

#include "base/time/time.h"

#include "content/browser/background_sync/background_sync.pb.h"

#include "content/browser/background_sync/background_sync_registration_options.h"

-#include "content/common/background_sync_service.mojom.h"

#include "content/common/content_export.h"

#include "mojo/public/cpp/bindings/type_converter.h"

+#include "third_party/WebKit/public/platform/modules/background_sync/background_sync.mojom.h"

namespace content {

@@ -43,8 +43,10 @@ class CONTENT_EXPORT BackgroundSyncRegistration {

RegistrationId id() const { return id_; }

void set_id(RegistrationId id) { id_ = id; }

- mojom::BackgroundSyncState sync_state() const { return sync_state_; }

- void set_sync_state(mojom::BackgroundSyncState state) { sync_state_ = state; }

+ blink::mojom::BackgroundSyncState sync_state() const { return sync_state_; }

+ void set_sync_state(blink::mojom::BackgroundSyncState state) {

+ sync_state_ = state;

+ }

int num_attempts() const { return num_attempts_; }

void set_num_attempts(int num_attempts) { num_attempts_ = num_attempts; }

@@ -57,7 +59,8 @@ class CONTENT_EXPORT BackgroundSyncRegistration {

BackgroundSyncRegistrationOptions options_;

RegistrationId id_ = kInvalidRegistrationId;

- mojom::BackgroundSyncState sync_state_ = mojom::BackgroundSyncState::PENDING;

+ blink::mojom::BackgroundSyncState sync_state_ =

+ blink::mojom::BackgroundSyncState::PENDING;

int num_attempts_ = 0;

base::Time delay_until_;

};

@@ -69,15 +72,15 @@ namespace mojo {

template <>

struct CONTENT_EXPORT

TypeConverter<std::unique_ptr<content::BackgroundSyncRegistration>,

- content::mojom::SyncRegistrationPtr> {

+ blink::mojom::SyncRegistrationPtr> {

static std::unique_ptr<content::BackgroundSyncRegistration> Convert(

- const content::mojom::SyncRegistrationPtr& input);

+ const blink::mojom::SyncRegistrationPtr& input);

};

template <>

-struct CONTENT_EXPORT TypeConverter<content::mojom::SyncRegistrationPtr,

+struct CONTENT_EXPORT TypeConverter<blink::mojom::SyncRegistrationPtr,

content::BackgroundSyncRegistration> {

- static content::mojom::SyncRegistrationPtr Convert(

+ static blink::mojom::SyncRegistrationPtr Convert(

const content::BackgroundSyncRegistration& input);

};

dcheng 2016/05/10 05:06:03 Can we try to clean up these type converters in a

juncai 2016/05/10 20:40:13 It seems that the implementation of these were del