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

Unified Diff: content/renderer/service_worker/service_worker_context_client.cc

Issue 2646313002: PaymentApp: Implement invokePaymentApp() in renderer side. (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
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 3a0baf07e43286805bf9413ec531e2a913d9274e..57cf7906bdb4efaad94901fd650a93217e0f0c6e 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -38,6 +38,7 @@
#include "content/common/service_worker/service_worker_event_dispatcher.mojom.h"
#include "content/common/service_worker/service_worker_messages.h"
#include "content/common/service_worker/service_worker_status_code.h"
+#include "content/common/service_worker/service_worker_type_converters.h"
#include "content/common/service_worker/service_worker_utils.h"
#include "content/public/common/push_event_payload.h"
#include "content/public/common/referrer.h"
@@ -58,6 +59,7 @@
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
#include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
+#include "third_party/WebKit/public/platform/modules/payments/WebPaymentAppRequestData.h"
#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptions.h"
#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerError.h"
#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerRequest.h"
@@ -204,6 +206,8 @@ struct ServiceWorkerContextClient::WorkerContextData {
using SkipWaitingCallbacksMap =
IDMap<std::unique_ptr<blink::WebServiceWorkerSkipWaitingCallbacks>>;
using SyncEventCallbacksMap = IDMap<std::unique_ptr<const SyncCallback>>;
+ using PaymentRequestEventCallbacksMap =
+ IDMap<std::unique_ptr<const PaymentRequestEventCallback>>;
using PushEventCallbacksMap =
IDMap<std::unique_ptr<const DispatchPushEventCallback>>;
using FetchEventCallbacksMap = IDMap<std::unique_ptr<const FetchCallback>>;
@@ -238,6 +242,9 @@ struct ServiceWorkerContextClient::WorkerContextData {
// Pending callbacks for Background Sync Events.
SyncEventCallbacksMap sync_event_callbacks;
+ // Pending callbacks for Payment Request Events.
+ PaymentRequestEventCallbacksMap payment_request_event_callbacks;
+
// Pending callbacks for Push Events.
PushEventCallbacksMap push_event_callbacks;
@@ -750,6 +757,18 @@ void ServiceWorkerContextClient::didHandleSyncEvent(
context_->sync_event_callbacks.Remove(request_id);
}
+void ServiceWorkerContextClient::didHandlePaymentRequestEvent(
+ int request_id,
+ blink::WebServiceWorkerEventResult result,
+ double event_dispatch_time) {
+ const PaymentRequestEventCallback* callback =
+ context_->payment_request_event_callbacks.Lookup(request_id);
+ DCHECK(callback);
+ callback->Run(EventResultToStatus(result),
+ base::Time::FromDoubleT(event_dispatch_time));
+ context_->payment_request_event_callbacks.Remove(request_id);
+}
+
blink::WebServiceWorkerNetworkProvider*
ServiceWorkerContextClient::createServiceWorkerNetworkProvider(
blink::WebDataSource* data_source) {
@@ -868,7 +887,11 @@ void ServiceWorkerContextClient::DispatchSyncEvent(
void ServiceWorkerContextClient::DispatchPaymentRequestEvent(
payments::mojom::PaymentAppRequestDataPtr data,
const DispatchPaymentRequestEventCallback& callback) {
- NOTIMPLEMENTED();
+ int request_id = context_->payment_request_event_callbacks.Add(
tommyt 2017/01/23 12:54:30 I think it might be better to do the following her
zino 2017/02/01 09:24:48 Good point. Yes, we might have to do that later. B
tommyt 2017/02/01 09:42:00 I agree. Let's leave this for later.
+ base::MakeUnique<PaymentRequestEventCallback>(callback));
+ blink::WebPaymentAppRequestData webData =
+ mojo::ConvertTo<blink::WebPaymentAppRequestData>(std::move(data));
+ proxy_->dispatchPaymentRequestEvent(request_id, webData);
}
void ServiceWorkerContextClient::Send(IPC::Message* message) {

Powered by Google App Engine
This is Rietveld 408576698