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

Unified Diff: content/browser/notifications/notification_event_dispatcher_impl.cc

Issue 1269923003: Plumb notification action index for desktop SW notificationclick (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@actions
Patch Set: Created 5 years, 4 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
Index: content/browser/notifications/notification_event_dispatcher_impl.cc
diff --git a/content/browser/notifications/notification_event_dispatcher_impl.cc b/content/browser/notifications/notification_event_dispatcher_impl.cc
index 1f72416aa098cff9d91de77e56dd2813ec41a212..204fea21ae61b7dbf875f1d638151438882572ef 100644
--- a/content/browser/notifications/notification_event_dispatcher_impl.cc
+++ b/content/browser/notifications/notification_event_dispatcher_impl.cc
@@ -67,6 +67,7 @@ void NotificationClickEventFinished(
// registration was available. Must be called on the IO thread.
void DispatchNotificationClickEventOnRegistration(
const NotificationDatabaseData& notification_database_data,
+ int action_index,
const NotificationClickDispatchCompleteCallback& dispatch_complete_callback,
ServiceWorkerStatusCode service_worker_status,
const scoped_refptr<ServiceWorkerRegistration>&
@@ -82,7 +83,8 @@ void DispatchNotificationClickEventOnRegistration(
DispatchNotificationClickEvent(
dispatch_event_callback,
notification_database_data.notification_id,
- notification_database_data.notification_data);
+ notification_database_data.notification_data,
+ action_index);
return;
}
@@ -124,6 +126,7 @@ void DispatchNotificationClickEventOnRegistration(
// |service_worker_registration_id|. Must be called on the IO thread.
void FindServiceWorkerRegistration(
const GURL& origin,
+ int action_index,
const NotificationClickDispatchCompleteCallback& dispatch_complete_callback,
scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
bool success,
@@ -142,7 +145,7 @@ void FindServiceWorkerRegistration(
notification_database_data.service_worker_registration_id,
origin,
base::Bind(&DispatchNotificationClickEventOnRegistration,
- notification_database_data,
+ notification_database_data, action_index,
dispatch_complete_callback));
}
@@ -151,6 +154,7 @@ void FindServiceWorkerRegistration(
void ReadNotificationDatabaseData(
int64_t persistent_notification_id,
const GURL& origin,
+ int action_index,
const NotificationClickDispatchCompleteCallback& dispatch_complete_callback,
scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
scoped_refptr<PlatformNotificationContextImpl> notification_context) {
@@ -159,7 +163,8 @@ void ReadNotificationDatabaseData(
persistent_notification_id,
origin,
base::Bind(&FindServiceWorkerRegistration,
- origin, dispatch_complete_callback, service_worker_context));
+ origin, action_index, dispatch_complete_callback,
+ service_worker_context));
}
} // namespace
@@ -183,6 +188,7 @@ void NotificationEventDispatcherImpl::DispatchNotificationClickEvent(
BrowserContext* browser_context,
int64_t persistent_notification_id,
const GURL& origin,
+ int action_index,
const NotificationClickDispatchCompleteCallback&
dispatch_complete_callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -205,6 +211,7 @@ void NotificationEventDispatcherImpl::DispatchNotificationClickEvent(
base::Bind(&ReadNotificationDatabaseData,
persistent_notification_id,
origin,
+ action_index,
dispatch_complete_callback,
service_worker_context,
notification_context));

Powered by Google App Engine
This is Rietveld 408576698