Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClient.cpp |
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClient.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClient.cpp |
index fd3db7a01baae5722ec077b8b21ee299a499dc72..34d45883c70e08368abf69aa2646c04ae614a992 100644 |
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClient.cpp |
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClient.cpp |
@@ -14,6 +14,7 @@ |
#include "core/workers/WorkerLocation.h" |
#include "modules/serviceworkers/ServiceWorkerError.h" |
#include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
+#include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h" |
#include "public/platform/WebString.h" |
#include "wtf/RefPtr.h" |
@@ -72,11 +73,11 @@ ScriptPromise ServiceWorkerWindowClient::navigate(ScriptState* scriptState, cons |
return promise; |
} |
if (!context->securityOrigin()->canDisplay(parsedUrl)) { |
- resolver->reject(DOMException::create(SecurityError, "'" + parsedUrl.elidedString() + "' cannot navigate.")); |
+ resolver->reject(V8ThrowException::createTypeError(scriptState->isolate(), "'" + parsedUrl.elidedString() + "' cannot navigate.")); |
return promise; |
} |
- ServiceWorkerGlobalScopeClient::from(context)->navigate(uuid(), parsedUrl, new CallbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver)); |
+ ServiceWorkerGlobalScopeClient::from(context)->navigate(uuid(), parsedUrl, new NavigateClientCallback(resolver)); |
return promise; |
} |