| 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 611c2d09ac47133c9ec32c57c0801398f8a42d28..822aa29fbb01c19bdebe1b4289aea1870b1fb1af 100644
|
| --- a/content/renderer/service_worker/service_worker_context_client.cc
|
| +++ b/content/renderer/service_worker/service_worker_context_client.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/lazy_instance.h"
|
| #include "base/logging.h"
|
| #include "base/metrics/histogram_macros.h"
|
| +#include "base/strings/string16.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "base/threading/thread_local.h"
|
| @@ -803,8 +804,7 @@ void ServiceWorkerContextClient::OnFetchEvent(
|
| 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));
|
| }
|
| @@ -836,12 +836,14 @@ void ServiceWorkerContextClient::OnNotificationClickEvent(
|
| int request_id,
|
| const std::string& notification_id,
|
| const PlatformNotificationData& notification_data,
|
| - int action_index) {
|
| + int action_index,
|
| + const base::string16& 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(
|
|
|