content/browser/service_worker/service_worker_version.h - Issue 1220943003: [Background Sync] Use Mojo IPC to fire background sync events

Unified Diff: content/browser/service_worker/service_worker_version.h

Issue 1220943003: [Background Sync] Use Mojo IPC to fire background sync events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mek

Patch Set: Add connection error handler; make type converter safer. Created 5 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 | « content/browser/service_worker/service_worker_registration_unittest.cc ('k') | content/browser/service_worker/service_worker_version.cc » ('j') | content/renderer/background_sync/background_sync_client_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_version.h

diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h

index 47114dc06cf7ff2c06486ca927b795e40a96ee51..e756cb9b5d2ff4a0c109e8788db63d4904f86d47 100644

--- a/content/browser/service_worker/service_worker_version.h

+++ b/content/browser/service_worker/service_worker_version.h

@@ -21,6 +21,7 @@

#include "base/timer/timer.h"

#include "content/browser/service_worker/embedded_worker_instance.h"

#include "content/browser/service_worker/service_worker_script_cache_map.h"

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

#include "content/common/content_export.h"

#include "content/common/service_port_service.mojom.h"

#include "content/common/service_worker/service_worker_status_code.h"

@@ -438,8 +439,7 @@ class CONTENT_EXPORT ServiceWorkerVersion

void OnFetchEventFinished(int request_id,

ServiceWorkerFetchEventResult result,

const ServiceWorkerResponse& response);

- void OnSyncEventFinished(int request_id,

- blink::WebServiceWorkerEventResult result);

+ void OnSyncEventFinished(int request_id, ServiceWorkerEventStatus status);

void OnNotificationClickEventFinished(int request_id);

void OnPushEventFinished(int request_id,

blink::WebServiceWorkerEventResult result);

@@ -541,10 +541,11 @@ class CONTENT_EXPORT ServiceWorkerVersion

void OnStoppedInternal(EmbeddedWorkerInstance::Status old_status);

- // Called when the connection to a ServicePortDispatcher drops or fails.

+ // Called when a connection to a mojo event Dispatcher drops or fails.

// Calls callbacks for any outstanding requests to the dispatcher as well

// as cleans up the dispatcher.

void OnServicePortDispatcherConnectionError();

+ void OnBackgroundSyncDispatcherConnectionError();

const int64 version_id_;

const int64 registration_id_;

@@ -617,6 +618,8 @@ class CONTENT_EXPORT ServiceWorkerVersion

scoped_ptr<PingController> ping_controller_;

scoped_ptr<Metrics> metrics_;

+ BackgroundSyncServiceClientPtr background_sync_dispatcher_;

Marijn Kruisselbrink 2015/07/20 16:16:19 Maybe keep the declaration of the various mojo ser

iclelland 2015/07/20 18:05:20 Definitely. Done.

base::WeakPtrFactory<ServiceWorkerVersion> weak_factory_;

DISALLOW_COPY_AND_ASSIGN(ServiceWorkerVersion);