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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/FrameLoaderClientImpl.h

Issue 462613002: Cleanup namespace usage in Source/web/[A-V]*.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressing comments 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/ExternalPopupMenu.h ('k') | Source/web/FullscreenController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/FrameLoaderClientImpl.h
diff --git a/Source/web/FrameLoaderClientImpl.h b/Source/web/FrameLoaderClientImpl.h
index 0e4bbb6f4f0a366bb061a7c154130a2d7faf5490..afe7014f79e29a11d2fff77d027ba4d606f78311 100644
--- a/Source/web/FrameLoaderClientImpl.h
+++ b/Source/web/FrameLoaderClientImpl.h
@@ -43,14 +43,14 @@ class WebLocalFrameImpl;
class WebPluginContainerImpl;
class WebPluginLoadObserver;
-class FrameLoaderClientImpl FINAL : public blink::FrameLoaderClient {
+class FrameLoaderClientImpl FINAL : public FrameLoaderClient {
public:
explicit FrameLoaderClientImpl(WebLocalFrameImpl* webFrame);
virtual ~FrameLoaderClientImpl();
WebLocalFrameImpl* webFrame() const { return m_webFrame; }
- // blink::FrameLoaderClient ----------------------------------------------
+ // FrameLoaderClient ----------------------------------------------
// Notifies the WebView delegate that the JS window object has been cleared,
// giving it a chance to bind native objects to the window before script
@@ -66,91 +66,91 @@ public:
virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId) OVERRIDE;
virtual bool hasWebView() const OVERRIDE;
- virtual blink::Frame* opener() const OVERRIDE;
- virtual void setOpener(blink::Frame*) OVERRIDE;
- virtual blink::Frame* parent() const OVERRIDE;
- virtual blink::Frame* top() const OVERRIDE;
- virtual blink::Frame* previousSibling() const OVERRIDE;
- virtual blink::Frame* nextSibling() const OVERRIDE;
- virtual blink::Frame* firstChild() const OVERRIDE;
- virtual blink::Frame* lastChild() const OVERRIDE;
+ virtual Frame* opener() const OVERRIDE;
+ virtual void setOpener(Frame*) OVERRIDE;
+ virtual Frame* parent() const OVERRIDE;
+ virtual Frame* top() const OVERRIDE;
+ virtual Frame* previousSibling() const OVERRIDE;
+ virtual Frame* nextSibling() const OVERRIDE;
+ virtual Frame* firstChild() const OVERRIDE;
+ virtual Frame* lastChild() const OVERRIDE;
virtual void detachedFromParent() OVERRIDE;
- virtual void dispatchWillSendRequest(blink::DocumentLoader*, unsigned long identifier, blink::ResourceRequest&, const blink::ResourceResponse& redirectResponse) OVERRIDE;
- virtual void dispatchDidReceiveResponse(blink::DocumentLoader*, unsigned long identifier, const blink::ResourceResponse&) OVERRIDE;
- virtual void dispatchDidChangeResourcePriority(unsigned long identifier, blink::ResourceLoadPriority, int intraPriorityValue) OVERRIDE;
- virtual void dispatchDidFinishLoading(blink::DocumentLoader*, unsigned long identifier) OVERRIDE;
- virtual void dispatchDidLoadResourceFromMemoryCache(const blink::ResourceRequest&, const blink::ResourceResponse&) OVERRIDE;
+ virtual void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
+ virtual void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&) OVERRIDE;
+ virtual void dispatchDidChangeResourcePriority(unsigned long identifier, ResourceLoadPriority, int intraPriorityValue) OVERRIDE;
+ virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier) OVERRIDE;
+ virtual void dispatchDidLoadResourceFromMemoryCache(const ResourceRequest&, const ResourceResponse&) OVERRIDE;
virtual void dispatchDidHandleOnloadEvents() OVERRIDE;
virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() OVERRIDE;
- virtual void dispatchDidNavigateWithinPage(blink::HistoryItem*, blink::HistoryCommitType) OVERRIDE;
+ virtual void dispatchDidNavigateWithinPage(HistoryItem*, HistoryCommitType) OVERRIDE;
virtual void dispatchWillClose() OVERRIDE;
virtual void dispatchDidStartProvisionalLoad(bool isTransitionNavigation) OVERRIDE;
virtual void dispatchDidReceiveTitle(const String&) OVERRIDE;
- virtual void dispatchDidChangeIcons(blink::IconType) OVERRIDE;
- virtual void dispatchDidCommitLoad(blink::LocalFrame*, blink::HistoryItem*, blink::HistoryCommitType) OVERRIDE;
- virtual void dispatchDidFailProvisionalLoad(const blink::ResourceError&) OVERRIDE;
- virtual void dispatchDidFailLoad(const blink::ResourceError&) OVERRIDE;
+ virtual void dispatchDidChangeIcons(IconType) OVERRIDE;
+ virtual void dispatchDidCommitLoad(LocalFrame*, HistoryItem*, HistoryCommitType) OVERRIDE;
+ virtual void dispatchDidFailProvisionalLoad(const ResourceError&) OVERRIDE;
+ virtual void dispatchDidFailLoad(const ResourceError&) OVERRIDE;
virtual void dispatchDidFinishDocumentLoad() OVERRIDE;
virtual void dispatchDidFinishLoad() OVERRIDE;
virtual void dispatchDidFirstVisuallyNonEmptyLayout() OVERRIDE;
virtual void dispatchDidChangeThemeColor() OVERRIDE;
- virtual blink::NavigationPolicy decidePolicyForNavigation(const blink::ResourceRequest&, blink::DocumentLoader*, blink::NavigationPolicy, bool isTransitionNavigation) OVERRIDE;
+ virtual NavigationPolicy decidePolicyForNavigation(const ResourceRequest&, DocumentLoader*, NavigationPolicy, bool isTransitionNavigation) OVERRIDE;
virtual void dispatchAddNavigationTransitionData(const String& allowedDestinationOrigin, const String& selector, const String& markup) OVERRIDE;
- virtual void dispatchWillRequestResource(blink::FetchRequest*) OVERRIDE;
- virtual void dispatchWillSendSubmitEvent(blink::HTMLFormElement*) OVERRIDE;
- virtual void dispatchWillSubmitForm(blink::HTMLFormElement*) OVERRIDE;
- virtual void didStartLoading(blink::LoadStartType) OVERRIDE;
+ virtual void dispatchWillRequestResource(FetchRequest*) OVERRIDE;
+ virtual void dispatchWillSendSubmitEvent(HTMLFormElement*) OVERRIDE;
+ virtual void dispatchWillSubmitForm(HTMLFormElement*) OVERRIDE;
+ virtual void didStartLoading(LoadStartType) OVERRIDE;
virtual void didStopLoading() OVERRIDE;
virtual void progressEstimateChanged(double progressEstimate) OVERRIDE;
- virtual void loadURLExternally(const blink::ResourceRequest&, blink::NavigationPolicy, const String& suggestedName = String()) OVERRIDE;
+ virtual void loadURLExternally(const ResourceRequest&, NavigationPolicy, const String& suggestedName = String()) OVERRIDE;
virtual bool navigateBackForward(int offset) const OVERRIDE;
virtual void didAccessInitialDocument() OVERRIDE;
virtual void didDisplayInsecureContent() OVERRIDE;
- virtual void didRunInsecureContent(blink::SecurityOrigin*, const blink::KURL& insecureURL) OVERRIDE;
- virtual void didDetectXSS(const blink::KURL&, bool didBlockEntirePage) OVERRIDE;
- virtual void didDispatchPingLoader(const blink::KURL&) OVERRIDE;
+ virtual void didRunInsecureContent(SecurityOrigin*, const KURL& insecureURL) OVERRIDE;
+ virtual void didDetectXSS(const KURL&, bool didBlockEntirePage) OVERRIDE;
+ virtual void didDispatchPingLoader(const KURL&) OVERRIDE;
virtual void selectorMatchChanged(const Vector<String>& addedSelectors, const Vector<String>& removedSelectors) OVERRIDE;
- virtual PassRefPtr<blink::DocumentLoader> createDocumentLoader(blink::LocalFrame*, const blink::ResourceRequest&, const blink::SubstituteData&) OVERRIDE;
- virtual WTF::String userAgent(const blink::KURL&) OVERRIDE;
+ virtual PassRefPtr<DocumentLoader> createDocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&) OVERRIDE;
+ virtual WTF::String userAgent(const KURL&) OVERRIDE;
virtual WTF::String doNotTrackValue() OVERRIDE;
virtual void transitionToCommittedForNewPage() OVERRIDE;
- virtual PassRefPtr<blink::LocalFrame> createFrame(const blink::KURL&, const WTF::AtomicString& name, const blink::Referrer&, blink::HTMLFrameOwnerElement*) OVERRIDE;
+ virtual PassRefPtr<LocalFrame> createFrame(const KURL&, const WTF::AtomicString& name, const Referrer&, HTMLFrameOwnerElement*) OVERRIDE;
virtual bool canCreatePluginWithoutRenderer(const String& mimeType) const;
- virtual PassRefPtr<blink::Widget> createPlugin(
- blink::HTMLPlugInElement*, const blink::KURL&,
+ virtual PassRefPtr<Widget> createPlugin(
+ HTMLPlugInElement*, const KURL&,
const Vector<WTF::String>&, const Vector<WTF::String>&,
const WTF::String&, bool loadManually, DetachedPluginPolicy) OVERRIDE;
- virtual PassRefPtr<blink::Widget> createJavaAppletWidget(
- blink::HTMLAppletElement*,
- const blink::KURL& /* base_url */,
+ virtual PassRefPtr<Widget> createJavaAppletWidget(
+ HTMLAppletElement*,
+ const KURL& /* base_url */,
const Vector<WTF::String>& paramNames,
const Vector<WTF::String>& paramValues) OVERRIDE;
- virtual blink::ObjectContentType objectContentType(
- const blink::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) OVERRIDE;
+ virtual ObjectContentType objectContentType(
+ const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) OVERRIDE;
virtual void didChangeScrollOffset() OVERRIDE;
virtual void didUpdateCurrentHistoryItem() OVERRIDE;
virtual void didRemoveAllPendingStylesheet() OVERRIDE;
virtual bool allowScript(bool enabledPerSettings) OVERRIDE;
- virtual bool allowScriptFromSource(bool enabledPerSettings, const blink::KURL& scriptURL) OVERRIDE;
+ virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL) OVERRIDE;
virtual bool allowPlugins(bool enabledPerSettings) OVERRIDE;
- virtual bool allowImage(bool enabledPerSettings, const blink::KURL& imageURL) OVERRIDE;
- virtual bool allowMedia(const blink::KURL& mediaURL) OVERRIDE;
- virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, blink::SecurityOrigin*, const blink::KURL&) OVERRIDE;
- virtual bool allowRunningInsecureContent(bool enabledPerSettings, blink::SecurityOrigin*, const blink::KURL&) OVERRIDE;
+ virtual bool allowImage(bool enabledPerSettings, const KURL& imageURL) OVERRIDE;
+ virtual bool allowMedia(const KURL& mediaURL) OVERRIDE;
+ virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin*, const KURL&) OVERRIDE;
+ virtual bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, const KURL&) OVERRIDE;
virtual void didNotAllowScript() OVERRIDE;
virtual void didNotAllowPlugins() OVERRIDE;
virtual WebCookieJar* cookieJar() const OVERRIDE;
- virtual bool willCheckAndDispatchMessageEvent(blink::SecurityOrigin* target, blink::MessageEvent*) const OVERRIDE;
+ virtual bool willCheckAndDispatchMessageEvent(SecurityOrigin* target, MessageEvent*) const OVERRIDE;
virtual void didChangeName(const String&) OVERRIDE;
- virtual void dispatchWillOpenSocketStream(blink::SocketStreamHandle*) OVERRIDE;
- virtual void dispatchWillOpenWebSocket(blink::WebSocketHandle*) OVERRIDE;
+ virtual void dispatchWillOpenSocketStream(SocketStreamHandle*) OVERRIDE;
+ virtual void dispatchWillOpenWebSocket(WebSocketHandle*) OVERRIDE;
- virtual void dispatchWillStartUsingPeerConnectionHandler(blink::WebRTCPeerConnectionHandler*) OVERRIDE;
+ virtual void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler*) OVERRIDE;
- virtual void didRequestAutocomplete(blink::HTMLFormElement*) OVERRIDE;
+ virtual void didRequestAutocomplete(HTMLFormElement*) OVERRIDE;
virtual bool allowWebGL(bool enabledPerSettings) OVERRIDE;
virtual void didLoseWebGLContext(int arbRobustnessContextLostReason) OVERRIDE;
@@ -158,7 +158,7 @@ public:
virtual void dispatchWillInsertBody() OVERRIDE;
virtual PassOwnPtr<WebServiceWorkerProvider> createServiceWorkerProvider() OVERRIDE;
- virtual blink::SharedWorkerRepositoryClient* sharedWorkerRepositoryClient() OVERRIDE;
+ virtual SharedWorkerRepositoryClient* sharedWorkerRepositoryClient() OVERRIDE;
virtual PassOwnPtr<WebApplicationCacheHost> createApplicationCacheHost(WebApplicationCacheHostClient*) OVERRIDE;
@@ -169,14 +169,14 @@ public:
private:
virtual bool isFrameLoaderClientImpl() const OVERRIDE { return true; }
- PassOwnPtr<WebPluginLoadObserver> pluginLoadObserver(blink::DocumentLoader*);
+ PassOwnPtr<WebPluginLoadObserver> pluginLoadObserver(DocumentLoader*);
// The WebFrame that owns this object and manages its lifetime. Therefore,
// the web frame object is guaranteed to exist.
WebLocalFrameImpl* m_webFrame;
};
-DEFINE_TYPE_CASTS(FrameLoaderClientImpl, blink::FrameLoaderClient, client, client->isFrameLoaderClientImpl(), client.isFrameLoaderClientImpl());
+DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFrameLoaderClientImpl(), client.isFrameLoaderClientImpl());
} // namespace blink
« no previous file with comments | « Source/web/ExternalPopupMenu.h ('k') | Source/web/FullscreenController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698