| Index: content/renderer/service_worker/service_worker_context_client.cc
|
| diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
|
| index 52a97a47b250cc946729073c88e9389b3f19f558..13fea5e3ff468de18d16af2a7336f7084373e502 100644
|
| --- a/content/renderer/service_worker/service_worker_context_client.cc
|
| +++ b/content/renderer/service_worker/service_worker_context_client.cc
|
| @@ -15,7 +15,6 @@
|
| #include "base/threading/thread_checker.h"
|
| #include "base/threading/thread_local.h"
|
| #include "base/trace_event/trace_event.h"
|
| -#include "content/child/notifications/notification_data_conversions.h"
|
| #include "content/child/request_extra_data.h"
|
| #include "content/child/service_worker/service_worker_dispatcher.h"
|
| #include "content/child/service_worker/service_worker_handle_reference.h"
|
| @@ -50,7 +49,6 @@
|
| #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| #include "third_party/WebKit/public/platform/modules/background_sync/WebSyncRegistration.h"
|
| -#include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptions.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerRequest.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerResponse.h"
|
| @@ -794,11 +792,13 @@ void ServiceWorkerContextClient::OnNotificationClickEvent(
|
| int action_index) {
|
| TRACE_EVENT0("ServiceWorker",
|
| "ServiceWorkerContextClient::OnNotificationClickEvent");
|
| +/**
|
| proxy_->dispatchNotificationClickEvent(
|
| request_id,
|
| persistent_notification_id,
|
| - ToWebNotificationData(notification_data),
|
| + __mojo__notification__thing__
|
| action_index);
|
| +**/
|
| }
|
|
|
| void ServiceWorkerContextClient::OnNotificationCloseEvent(
|
| @@ -807,9 +807,11 @@ void ServiceWorkerContextClient::OnNotificationCloseEvent(
|
| const PlatformNotificationData& notification_data) {
|
| TRACE_EVENT0("ServiceWorker",
|
| "ServiceWorkerContextClient::OnNotificationCloseEvent");
|
| +/**
|
| proxy_->dispatchNotificationCloseEvent(
|
| request_id, persistent_notification_id,
|
| - ToWebNotificationData(notification_data));
|
| + __mojo__notification__thing__);
|
| +**/
|
| }
|
|
|
| void ServiceWorkerContextClient::OnPushEvent(int request_id,
|
|
|