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

Unified Diff: Source/web/WebFrame.cpp

Issue 468083003: Cleanup namespace usage in Source/web/Web[A-H]*.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebasing Created 6 years, 4 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 | « Source/web/WebFormElement.cpp ('k') | Source/web/WebGeolocationController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebFrame.cpp
diff --git a/Source/web/WebFrame.cpp b/Source/web/WebFrame.cpp
index 5037543c6880099b9827ed081b945d1904268898..00aa7c811989467160fa767fee15ba5d3b0ec7bf 100644
--- a/Source/web/WebFrame.cpp
+++ b/Source/web/WebFrame.cpp
@@ -12,7 +12,6 @@
#include "web/WebRemoteFrameImpl.h"
#include <algorithm>
-
namespace blink {
Frame* toCoreFrame(const WebFrame* frame)
@@ -31,7 +30,7 @@ void WebFrame::swap(WebFrame* frame)
// All child frames must have been detached first.
ASSERT(!m_firstChild && !m_lastChild);
- // The frame being swapped in should not have a blink::Frame associated
+ // The frame being swapped in should not have a Frame associated
// with it yet.
ASSERT(!toCoreFrame(frame));
@@ -62,7 +61,7 @@ void WebFrame::swap(WebFrame* frame)
frame->m_openedFrameTracker.reset(m_openedFrameTracker.release());
}
- // Finally, clone the state of the current blink::Frame into one matching
+ // Finally, clone the state of the current Frame into one matching
// the type of the passed in WebFrame.
// FIXME: This is a bit clunky; this results in pointless decrements and
// increments of connected subframes.
@@ -184,7 +183,7 @@ WebFrame* WebFrame::findChildByName(const WebString& name) const
return fromFrame(frame->tree().child(name));
}
-WebFrame* WebFrame::fromFrame(blink::Frame* frame)
+WebFrame* WebFrame::fromFrame(Frame* frame)
{
if (!frame)
return 0;
« no previous file with comments | « Source/web/WebFormElement.cpp ('k') | Source/web/WebGeolocationController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698