Chromium Code Reviews| Index: content/renderer/service_worker/service_worker_context_client.h | 
| diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h | 
| index 3ec1e599d71f8ac33818a1de5344908916283887..443172025ed6a150cd3536d306f5cb9b763d5a60 100644 | 
| --- a/content/renderer/service_worker/service_worker_context_client.h | 
| +++ b/content/renderer/service_worker/service_worker_context_client.h | 
| @@ -73,6 +73,9 @@ class ServiceWorkerContextClient : public blink::WebServiceWorkerContextClient, | 
| using FetchCallback = | 
| base::Callback<void(ServiceWorkerStatusCode, | 
| base::Time /* dispatch_event_time */)>; | 
| + using PaymentRequestEventCallback = | 
| + base::Callback<void(ServiceWorkerStatusCode, | 
| + base::Time /* dispatch_event_time */)>; | 
| 
 
falken
2017/04/19 06:56:52
mistaken rebase?
 
shimazu
2017/04/19 08:32:16
Done.
 
 | 
| // Returns a thread-specific client instance. This does NOT create a | 
| // new instance. | 
| @@ -159,11 +162,16 @@ class ServiceWorkerContextClient : public blink::WebServiceWorkerContextClient, | 
| void DidHandleInstallEvent(int request_id, | 
| blink::WebServiceWorkerEventResult result, | 
| double event_dispatch_time) override; | 
| - void RespondToFetchEvent(int fetch_event_id, | 
| - double event_dispatch_time) override; | 
| + void RespondToFetchEventWithNoResponse(int fetch_event_id, | 
| + double event_dispatch_time) override; | 
| void RespondToFetchEvent(int fetch_event_id, | 
| const blink::WebServiceWorkerResponse& response, | 
| double event_dispatch_time) override; | 
| + void RespondToFetchEventWithResponseStream( | 
| + int fetch_event_id, | 
| + const blink::WebServiceWorkerResponse& response, | 
| + blink::WebServiceWorkerStreamHandle* web_body_as_stream, | 
| + double event_dispatch_time) override; | 
| void DidHandleFetchEvent(int fetch_event_id, | 
| blink::WebServiceWorkerEventResult result, | 
| double dispatch_event_time) override; | 
| @@ -246,10 +254,12 @@ class ServiceWorkerContextClient : public blink::WebServiceWorkerContextClient, | 
| void DispatchExtendableMessageEvent( | 
| mojom::ExtendableMessageEventPtr event, | 
| const DispatchExtendableMessageEventCallback& callback) override; | 
| - void DispatchFetchEvent(int fetch_event_id, | 
| - const ServiceWorkerFetchRequest& request, | 
| - mojom::FetchEventPreloadHandlePtr preload_handle, | 
| - const DispatchFetchEventCallback& callback) override; | 
| + void DispatchFetchEvent( | 
| + int fetch_event_id, | 
| + const ServiceWorkerFetchRequest& request, | 
| + mojom::FetchEventPreloadHandlePtr preload_handle, | 
| + mojom::ServiceWorkerFetchResponseCallbackPtr response_callback, | 
| + const DispatchFetchEventCallback& callback) override; | 
| void DispatchNotificationClickEvent( | 
| const std::string& notification_id, | 
| const PlatformNotificationData& notification_data, |