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

Side by Side Diff: content/renderer/service_worker/service_worker_context_client.cc

Issue 1619703002: Implement notificationclose event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Recovered a lost piece of logging. Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/service_worker/service_worker_context_client.h" 5 #include "content/renderer/service_worker/service_worker_context_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 int embedded_worker_id, 248 int embedded_worker_id,
249 const IPC::Message& message) { 249 const IPC::Message& message) {
250 CHECK_EQ(embedded_worker_id_, embedded_worker_id); 250 CHECK_EQ(embedded_worker_id_, embedded_worker_id);
251 bool handled = true; 251 bool handled = true;
252 IPC_BEGIN_MESSAGE_MAP(ServiceWorkerContextClient, message) 252 IPC_BEGIN_MESSAGE_MAP(ServiceWorkerContextClient, message)
253 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ActivateEvent, OnActivateEvent) 253 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ActivateEvent, OnActivateEvent)
254 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_FetchEvent, OnFetchEvent) 254 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_FetchEvent, OnFetchEvent)
255 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_InstallEvent, OnInstallEvent) 255 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_InstallEvent, OnInstallEvent)
256 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_NotificationClickEvent, 256 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_NotificationClickEvent,
257 OnNotificationClickEvent) 257 OnNotificationClickEvent)
258 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_NotificationCloseEvent,
259 OnNotificationCloseEvent)
258 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_PushEvent, OnPushEvent) 260 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_PushEvent, OnPushEvent)
259 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_GeofencingEvent, OnGeofencingEvent) 261 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_GeofencingEvent, OnGeofencingEvent)
260 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_MessageToWorker, OnPostMessage) 262 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_MessageToWorker, OnPostMessage)
261 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_CrossOriginMessageToWorker, 263 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_CrossOriginMessageToWorker,
262 OnCrossOriginMessageToWorker) 264 OnCrossOriginMessageToWorker)
263 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidGetClients, OnDidGetClients) 265 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_DidGetClients, OnDidGetClients)
264 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowResponse, 266 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowResponse,
265 OnOpenWindowResponse) 267 OnOpenWindowResponse)
266 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowError, 268 IPC_MESSAGE_HANDLER(ServiceWorkerMsg_OpenWindowError,
267 OnOpenWindowError) 269 OnOpenWindowError)
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 response)); 519 response));
518 } 520 }
519 521
520 void ServiceWorkerContextClient::didHandleNotificationClickEvent( 522 void ServiceWorkerContextClient::didHandleNotificationClickEvent(
521 int request_id, 523 int request_id,
522 blink::WebServiceWorkerEventResult result) { 524 blink::WebServiceWorkerEventResult result) {
523 Send(new ServiceWorkerHostMsg_NotificationClickEventFinished( 525 Send(new ServiceWorkerHostMsg_NotificationClickEventFinished(
524 GetRoutingID(), request_id, result)); 526 GetRoutingID(), request_id, result));
525 } 527 }
526 528
529 void ServiceWorkerContextClient::didHandleNotificationCloseEvent(
530 int request_id,
531 blink::WebServiceWorkerEventResult result) {
532 Send(new ServiceWorkerHostMsg_NotificationCloseEventFinished(
533 GetRoutingID(), request_id, result));
534 }
535
527 void ServiceWorkerContextClient::didHandlePushEvent( 536 void ServiceWorkerContextClient::didHandlePushEvent(
528 int request_id, 537 int request_id,
529 blink::WebServiceWorkerEventResult result) { 538 blink::WebServiceWorkerEventResult result) {
530 Send(new ServiceWorkerHostMsg_PushEventFinished( 539 Send(new ServiceWorkerHostMsg_PushEventFinished(
531 GetRoutingID(), request_id, result)); 540 GetRoutingID(), request_id, result));
532 } 541 }
533 542
534 void ServiceWorkerContextClient::didHandleSyncEvent( 543 void ServiceWorkerContextClient::didHandleSyncEvent(
535 int request_id, 544 int request_id,
536 blink::WebServiceWorkerEventResult result) { 545 blink::WebServiceWorkerEventResult result) {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 int action_index) { 761 int action_index) {
753 TRACE_EVENT0("ServiceWorker", 762 TRACE_EVENT0("ServiceWorker",
754 "ServiceWorkerContextClient::OnNotificationClickEvent"); 763 "ServiceWorkerContextClient::OnNotificationClickEvent");
755 proxy_->dispatchNotificationClickEvent( 764 proxy_->dispatchNotificationClickEvent(
756 request_id, 765 request_id,
757 persistent_notification_id, 766 persistent_notification_id,
758 ToWebNotificationData(notification_data), 767 ToWebNotificationData(notification_data),
759 action_index); 768 action_index);
760 } 769 }
761 770
771 void ServiceWorkerContextClient::OnNotificationCloseEvent(
772 int request_id,
773 int64_t persistent_notification_id,
774 const PlatformNotificationData& notification_data) {
775 TRACE_EVENT0("ServiceWorker",
776 "ServiceWorkerContextClient::OnNotificationCloseEvent");
777 proxy_->dispatchNotificationCloseEvent(
778 request_id, persistent_notification_id,
779 ToWebNotificationData(notification_data));
780 }
781
762 void ServiceWorkerContextClient::OnPushEvent(int request_id, 782 void ServiceWorkerContextClient::OnPushEvent(int request_id,
763 const std::string& data) { 783 const std::string& data) {
764 TRACE_EVENT0("ServiceWorker", 784 TRACE_EVENT0("ServiceWorker",
765 "ServiceWorkerContextClient::OnPushEvent"); 785 "ServiceWorkerContextClient::OnPushEvent");
766 proxy_->dispatchPushEvent(request_id, blink::WebString::fromUTF8(data)); 786 proxy_->dispatchPushEvent(request_id, blink::WebString::fromUTF8(data));
767 } 787 }
768 788
769 void ServiceWorkerContextClient::OnGeofencingEvent( 789 void ServiceWorkerContextClient::OnGeofencingEvent(
770 int request_id, 790 int request_id,
771 blink::WebGeofencingEventType event_type, 791 blink::WebGeofencingEventType event_type,
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 } 1006 }
987 1007
988 base::WeakPtr<ServiceWorkerContextClient> 1008 base::WeakPtr<ServiceWorkerContextClient>
989 ServiceWorkerContextClient::GetWeakPtr() { 1009 ServiceWorkerContextClient::GetWeakPtr() {
990 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); 1010 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
991 DCHECK(context_); 1011 DCHECK(context_);
992 return context_->weak_factory.GetWeakPtr(); 1012 return context_->weak_factory.GetWeakPtr();
993 } 1013 }
994 1014
995 } // namespace content 1015 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698