| 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 b321f8988fd1f08a3ace0cdb04338809cc4a4a7e..3cde95d5ef2ef89432bbbd328dd21c042cb8b36f 100644
|
| --- a/content/renderer/service_worker/service_worker_context_client.cc
|
| +++ b/content/renderer/service_worker/service_worker_context_client.cc
|
| @@ -867,8 +867,7 @@ void ServiceWorkerContextClient::DispatchFetchEvent(
|
| webRequest.setURL(blink::WebURL(request.url));
|
| webRequest.setMethod(blink::WebString::fromUTF8(request.method));
|
| for (ServiceWorkerHeaderMap::const_iterator it = request.headers.begin();
|
| - it != request.headers.end();
|
| - ++it) {
|
| + it != request.headers.end(); ++it) {
|
| webRequest.setHeader(blink::WebString::fromUTF8(it->first),
|
| blink::WebString::fromUTF8(it->second));
|
| }
|
| @@ -900,12 +899,14 @@ void ServiceWorkerContextClient::OnNotificationClickEvent(
|
| int request_id,
|
| const std::string& notification_id,
|
| const PlatformNotificationData& notification_data,
|
| - int action_index) {
|
| + int action_index,
|
| + const base::NullableString16& reply) {
|
| TRACE_EVENT0("ServiceWorker",
|
| "ServiceWorkerContextClient::OnNotificationClickEvent");
|
| proxy_->dispatchNotificationClickEvent(
|
| request_id, blink::WebString::fromUTF8(notification_id),
|
| - ToWebNotificationData(notification_data), action_index);
|
| + ToWebNotificationData(notification_data), action_index,
|
| + blink::WebString(reply));
|
| }
|
|
|
| void ServiceWorkerContextClient::OnNotificationCloseEvent(
|
|
|