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

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

Issue 980383004: Relax same-origin policy for ServiceWorker openWindow() in Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reject Created 5 years, 9 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_script_context.cc
diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc
index b94323e62556ce62729ef8b7e00773aa4920f142..f1b8d751aa69e92678b7c8d0dc1959fee51d6eaa 100644
--- a/content/renderer/service_worker/service_worker_script_context.cc
+++ b/content/renderer/service_worker/service_worker_script_context.cc
@@ -486,7 +486,9 @@ void ServiceWorkerScriptContext::OnOpenWindowResponse(
pending_client_callbacks_.Remove(request_id);
}
-void ServiceWorkerScriptContext::OnOpenWindowError(int request_id) {
+void ServiceWorkerScriptContext::OnOpenWindowError(
+ int request_id,
+ const std::string& message) {
TRACE_EVENT0("ServiceWorker",
"ServiceWorkerScriptContext::OnOpenWindowError");
blink::WebServiceWorkerClientCallbacks* callbacks =
@@ -498,7 +500,7 @@ void ServiceWorkerScriptContext::OnOpenWindowError(int request_id) {
scoped_ptr<blink::WebServiceWorkerError> error(
new blink::WebServiceWorkerError(
blink::WebServiceWorkerError::ErrorTypeUnknown,
- "Something went wrong while trying to open the window."));
+ blink::WebString::fromLatin1(message)));
falken 2015/03/08 12:23:49 nit: WebString::fromUTF8() is much more widely use
mlamouri (slow - plz ping) 2015/03/08 14:34:12 Done.
callbacks->onError(error.release());
pending_client_callbacks_.Remove(request_id);
}

Powered by Google App Engine
This is Rietveld 408576698