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

Unified Diff: Source/web/WebLocalFrameImpl.h

Issue 467573002: Cleanup namespace usage in Source/web/Web*.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/WebInputEventConversion.h ('k') | Source/web/WebMediaPlayerClientImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebLocalFrameImpl.h
diff --git a/Source/web/WebLocalFrameImpl.h b/Source/web/WebLocalFrameImpl.h
index 159dcdb0b7079e3095e8bc72f392769d31cb8889..bd2aa7a167cdeb32b663532e05af046057b67e6f 100644
--- a/Source/web/WebLocalFrameImpl.h
+++ b/Source/web/WebLocalFrameImpl.h
@@ -44,6 +44,9 @@
#include "wtf/text/WTFString.h"
namespace blink {
+
+class ChromePrintContext;
+class GeolocationClientProxy;
class GraphicsContext;
class HTMLInputElement;
class HistoryItem;
@@ -51,15 +54,8 @@ class IntSize;
class KURL;
class Node;
class Range;
-class SubstituteData;
-struct FrameLoadRequest;
-struct WindowFeatures;
-}
-
-namespace blink {
-class ChromePrintContext;
-class GeolocationClientProxy;
class SharedWorkerRepositoryClientImpl;
+class SubstituteData;
class TextFinder;
class WebDataSourceImpl;
class WebInputElement;
@@ -69,7 +65,9 @@ class WebPlugin;
class WebPluginContainerImpl;
class WebView;
class WebViewImpl;
+struct FrameLoadRequest;
struct WebPrintParams;
+struct WindowFeatures;
template <typename T> class WebVector;
@@ -237,31 +235,31 @@ public:
static WebLocalFrameImpl* create(WebFrameClient*);
virtual ~WebLocalFrameImpl();
- PassRefPtr<blink::LocalFrame> initializeWebCoreFrame(blink::FrameHost*, blink::FrameOwner*, const AtomicString& name, const AtomicString& fallbackName);
+ PassRefPtr<LocalFrame> initializeWebCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& fallbackName);
- PassRefPtr<blink::LocalFrame> createChildFrame(
- const blink::FrameLoadRequest&, blink::HTMLFrameOwnerElement*);
+ PassRefPtr<LocalFrame> createChildFrame(
+ const FrameLoadRequest&, HTMLFrameOwnerElement*);
- void didChangeContentsSize(const blink::IntSize&);
+ void didChangeContentsSize(const IntSize&);
void createFrameView();
- static WebLocalFrameImpl* fromFrame(blink::LocalFrame*);
- static WebLocalFrameImpl* fromFrame(blink::LocalFrame&);
- static WebLocalFrameImpl* fromFrameOwnerElement(blink::Element*);
+ static WebLocalFrameImpl* fromFrame(LocalFrame*);
+ static WebLocalFrameImpl* fromFrame(LocalFrame&);
+ static WebLocalFrameImpl* fromFrameOwnerElement(Element*);
// If the frame hosts a PluginDocument, this method returns the WebPluginContainerImpl
// that hosts the plugin.
- static WebPluginContainerImpl* pluginContainerFromFrame(blink::LocalFrame*);
+ static WebPluginContainerImpl* pluginContainerFromFrame(LocalFrame*);
// If the frame hosts a PluginDocument, this method returns the WebPluginContainerImpl
// that hosts the plugin. If the provided node is a plugin, then it runs its
// WebPluginContainerImpl.
- static WebPluginContainerImpl* pluginContainerFromNode(blink::LocalFrame*, const WebNode&);
+ static WebPluginContainerImpl* pluginContainerFromNode(LocalFrame*, const WebNode&);
WebViewImpl* viewImpl() const;
- blink::FrameView* frameView() const { return frame() ? frame()->view() : 0; }
+ FrameView* frameView() const { return frame() ? frame()->view() : 0; }
// Getters for the impls corresponding to Get(Provisional)DataSource. They
// may return 0 if there is no corresponding data source.
@@ -275,7 +273,7 @@ public:
// Returns the active match in the current frame. Could be a null range if
// the local frame has no active match.
- blink::Range* activeMatch() const;
+ Range* activeMatch() const;
// When a Find operation ends, we want to set the selection to what was active
// and set focus to the first focusable node we find (starting with the first
@@ -285,23 +283,23 @@ public:
// allows us to navigate by pressing Enter after closing the Find box.
void setFindEndstateFocusAndSelection();
- void didFail(const blink::ResourceError&, bool wasProvisional);
+ void didFail(const ResourceError&, bool wasProvisional);
// Sets whether the WebLocalFrameImpl allows its document to be scrolled.
// If the parameter is true, allow the document to be scrolled.
// Otherwise, disallow scrolling.
virtual void setCanHaveScrollbars(bool) OVERRIDE;
- blink::LocalFrame* frame() const { return m_frame.get(); }
+ LocalFrame* frame() const { return m_frame.get(); }
WebFrameClient* client() const { return m_client; }
void setClient(WebFrameClient* client) { m_client = client; }
WebPermissionClient* permissionClient() { return m_permissionClient; }
SharedWorkerRepositoryClientImpl* sharedWorkerRepositoryClient() const { return m_sharedWorkerRepositoryClient.get(); }
- void setInputEventsTransformForEmulation(const blink::IntSize&, float);
+ void setInputEventsTransformForEmulation(const IntSize&, float);
- static void selectWordAroundPosition(blink::LocalFrame*, blink::VisiblePosition);
+ static void selectWordAroundPosition(LocalFrame*, VisiblePosition);
// Returns the text finder object if it already exists.
// Otherwise creates it and then returns.
@@ -314,7 +312,7 @@ public:
void invalidateAll() const;
// Returns a hit-tested VisiblePosition for the given point
- blink::VisiblePosition visiblePositionForWindowPoint(const WebPoint&);
+ VisiblePosition visiblePositionForWindowPoint(const WebPoint&);
private:
friend class FrameLoaderClientImpl;
@@ -322,9 +320,9 @@ private:
explicit WebLocalFrameImpl(WebFrameClient*);
// Sets the local WebCore frame and registers destruction observers.
- void setWebCoreFrame(PassRefPtr<blink::LocalFrame>);
+ void setWebCoreFrame(PassRefPtr<LocalFrame>);
- void loadJavaScriptURL(const blink::KURL&);
+ void loadJavaScriptURL(const KURL&);
WebPlugin* focusedPluginIfInputMethodSupported();
@@ -333,7 +331,7 @@ private:
// The embedder retains a reference to the WebCore LocalFrame while it is active in the DOM. This
// reference is released when the frame is removed from the DOM or the entire page is closed.
// FIXME: These will need to change to WebFrame when we introduce WebFrameProxy.
- RefPtr<blink::LocalFrame> m_frame;
+ RefPtr<LocalFrame> m_frame;
// Indicate whether the current LocalFrame is local or remote. Remote frames are
// rendered in a different process from their parent frames.
@@ -351,7 +349,7 @@ private:
OwnPtrWillBePersistent<ChromePrintContext> m_printContext;
// Stores the additional input events offset and scale when device metrics emulation is enabled.
- blink::IntSize m_inputEventsOffsetForEmulation;
+ IntSize m_inputEventsOffsetForEmulation;
float m_inputEventsScaleFactorForEmulation;
UserMediaClientImpl m_userMediaClientImpl;
« no previous file with comments | « Source/web/WebInputEventConversion.h ('k') | Source/web/WebMediaPlayerClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698