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

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: review comments 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
« no previous file with comments | « content/renderer/service_worker/service_worker_script_context.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2f731dba2711ad428a8f99ebe67c289ed580ff27..7bd700c11d864897915fe319d65abd055987c982 100644
--- a/content/renderer/service_worker/service_worker_script_context.cc
+++ b/content/renderer/service_worker/service_worker_script_context.cc
@@ -492,7 +492,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 =
@@ -504,7 +506,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::fromUTF8(message)));
callbacks->onError(error.release());
pending_client_callbacks_.Remove(request_id);
}
« no previous file with comments | « content/renderer/service_worker/service_worker_script_context.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698