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

Unified Diff: Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp

Issue 879423003: Move Location to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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: Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp
diff --git a/Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp b/Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp
index 667f8b6cf442071b7961c8b520efdae497a1d254..2eb09124764455bba7cdaa22c574893b929adc51 100644
--- a/Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp
+++ b/Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp
@@ -154,10 +154,10 @@ PassOwnPtrWillBeRawPtr<NavigatorContentUtils> NavigatorContentUtils::create(Pass
void NavigatorContentUtils::registerProtocolHandler(Navigator& navigator, const String& scheme, const String& url, const String& title, ExceptionState& exceptionState)
{
- if (!navigator.frame())
+ if (!navigator.localFrame())
return;
- Document* document = navigator.frame()->document();
+ Document* document = navigator.localFrame()->document();
ASSERT(document);
if (!verifyCustomHandlerURL(*document, url, exceptionState))
@@ -193,10 +193,10 @@ String NavigatorContentUtils::isProtocolHandlerRegistered(Navigator& navigator,
{
DEFINE_STATIC_LOCAL(const String, declined, ("declined"));
- if (!navigator.frame())
+ if (!navigator.localFrame())
return declined;
- Document* document = navigator.frame()->document();
+ Document* document = navigator.localFrame()->document();
ASSERT(document);
if (document->activeDOMObjectsAreStopped())
return declined;
@@ -213,10 +213,10 @@ String NavigatorContentUtils::isProtocolHandlerRegistered(Navigator& navigator,
void NavigatorContentUtils::unregisterProtocolHandler(Navigator& navigator, const String& scheme, const String& url, ExceptionState& exceptionState)
{
- if (!navigator.frame())
+ if (!navigator.localFrame())
return;
- Document* document = navigator.frame()->document();
+ Document* document = navigator.localFrame()->document();
ASSERT(document);
if (!verifyCustomHandlerURL(*document, url, exceptionState))

Powered by Google App Engine
This is Rietveld 408576698