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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/FrameLoaderClientImpl.h

Issue 135753002: Update web classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 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
« no previous file with comments | « Source/web/ExternalPopupMenu.h ('k') | Source/web/FrameLoaderClientImpl.cpp » ('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 5eec1b27d8704e30bdfa2b52ebc6224f0e0886c4..4ae2bb7d5da9cb44f4bd59be8d2ec432f0db9699 100644
--- a/Source/web/FrameLoaderClientImpl.h
+++ b/Source/web/FrameLoaderClientImpl.h
@@ -43,10 +43,10 @@ class WebFrameImpl;
class WebPluginContainerImpl;
class WebPluginLoadObserver;
-class FrameLoaderClientImpl : public WebCore::FrameLoaderClient {
+class FrameLoaderClientImpl FINAL : public WebCore::FrameLoaderClient {
public:
FrameLoaderClientImpl(WebFrameImpl* webFrame);
- ~FrameLoaderClientImpl();
+ virtual ~FrameLoaderClientImpl();
WebFrameImpl* webFrame() const { return m_webFrame; }
@@ -55,87 +55,86 @@ public:
// 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
// parsing begins.
- virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*);
- virtual void documentElementAvailable();
+ virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*) OVERRIDE;
+ virtual void documentElementAvailable() OVERRIDE;
// Script in the page tried to allocate too much memory.
virtual void didExhaustMemoryAvailableForScript();
- virtual void didCreateScriptContext(v8::Handle<v8::Context>, int extensionGroup, int worldId);
- virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId);
+ virtual void didCreateScriptContext(v8::Handle<v8::Context>, int extensionGroup, int worldId) OVERRIDE;
+ virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId) OVERRIDE;
// Returns true if we should allow the given V8 extension to be added to
// the script context at the currently loading page and given extension group.
- virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId);
-
- virtual bool hasWebView() const;
- virtual bool hasFrameView() const;
- virtual void detachedFromParent();
- virtual void dispatchWillRequestAfterPreconnect(WebCore::ResourceRequest&);
- virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
- virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&);
- virtual void dispatchDidChangeResourcePriority(unsigned long identifier, WebCore::ResourceLoadPriority);
- virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier);
- virtual void dispatchDidLoadResourceFromMemoryCache(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
- virtual void dispatchDidHandleOnloadEvents();
- virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();
- virtual void dispatchDidNavigateWithinPage(WebCore::HistoryItem*, WebCore::HistoryCommitType);
- virtual void dispatchWillClose();
- virtual void dispatchDidStartProvisionalLoad();
- virtual void dispatchDidReceiveTitle(const String&);
- virtual void dispatchDidChangeIcons(WebCore::IconType);
- virtual void dispatchDidCommitLoad(WebCore::Frame*, WebCore::HistoryItem*, WebCore::HistoryCommitType);
- virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
- virtual void dispatchDidFailLoad(const WebCore::ResourceError&);
- virtual void dispatchDidFinishDocumentLoad();
- virtual void dispatchDidFinishLoad();
+ virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId) OVERRIDE;
+
+ virtual bool hasWebView() const OVERRIDE;
+ virtual void detachedFromParent() OVERRIDE;
+ virtual void dispatchWillRequestAfterPreconnect(WebCore::ResourceRequest&) OVERRIDE;
+ virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) OVERRIDE;
+ virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) OVERRIDE;
+ virtual void dispatchDidChangeResourcePriority(unsigned long identifier, WebCore::ResourceLoadPriority) OVERRIDE;
+ virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) OVERRIDE;
+ virtual void dispatchDidLoadResourceFromMemoryCache(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) OVERRIDE;
+ virtual void dispatchDidHandleOnloadEvents() OVERRIDE;
+ virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() OVERRIDE;
+ virtual void dispatchDidNavigateWithinPage(WebCore::HistoryItem*, WebCore::HistoryCommitType) OVERRIDE;
+ virtual void dispatchWillClose() OVERRIDE;
+ virtual void dispatchDidStartProvisionalLoad() OVERRIDE;
+ virtual void dispatchDidReceiveTitle(const String&) OVERRIDE;
+ virtual void dispatchDidChangeIcons(WebCore::IconType) OVERRIDE;
+ virtual void dispatchDidCommitLoad(WebCore::Frame*, WebCore::HistoryItem*, WebCore::HistoryCommitType) OVERRIDE;
+ virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&) OVERRIDE;
+ virtual void dispatchDidFailLoad(const WebCore::ResourceError&) OVERRIDE;
+ virtual void dispatchDidFinishDocumentLoad() OVERRIDE;
+ virtual void dispatchDidFinishLoad() OVERRIDE;
virtual void dispatchDidFirstVisuallyNonEmptyLayout() OVERRIDE;
- virtual WebCore::NavigationPolicy decidePolicyForNavigation(const WebCore::ResourceRequest&, WebCore::DocumentLoader*, WebCore::NavigationPolicy);
- virtual void dispatchWillRequestResource(WebCore::FetchRequest*);
- virtual void dispatchWillSendSubmitEvent(PassRefPtr<WebCore::FormState>);
- virtual void dispatchWillSubmitForm(PassRefPtr<WebCore::FormState>);
- virtual void postProgressStartedNotification(WebCore::LoadStartType);
- virtual void postProgressEstimateChangedNotification();
- virtual void postProgressFinishedNotification();
- virtual void loadURLExternally(const WebCore::ResourceRequest&, WebCore::NavigationPolicy, const String& suggestedName = String());
- virtual bool navigateBackForward(int offset) const;
- virtual void didAccessInitialDocument();
- virtual void didDisownOpener();
- virtual void didDisplayInsecureContent();
- virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL& insecureURL);
- virtual void didDetectXSS(const WebCore::KURL&, bool didBlockEntirePage);
- virtual void didDispatchPingLoader(const WebCore::KURL&);
- virtual void selectorMatchChanged(const Vector<String>& addedSelectors, const Vector<String>& removedSelectors);
- virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(WebCore::Frame*, const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
- virtual WTF::String userAgent(const WebCore::KURL&);
- virtual WTF::String doNotTrackValue();
- virtual void transitionToCommittedForNewPage();
- virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL&, const WTF::AtomicString& name, const WTF::String& referrer, WebCore::HTMLFrameOwnerElement*);
+ virtual WebCore::NavigationPolicy decidePolicyForNavigation(const WebCore::ResourceRequest&, WebCore::DocumentLoader*, WebCore::NavigationPolicy) OVERRIDE;
+ virtual void dispatchWillRequestResource(WebCore::FetchRequest*) OVERRIDE;
+ virtual void dispatchWillSendSubmitEvent(PassRefPtr<WebCore::FormState>) OVERRIDE;
+ virtual void dispatchWillSubmitForm(PassRefPtr<WebCore::FormState>) OVERRIDE;
+ virtual void postProgressStartedNotification(WebCore::LoadStartType) OVERRIDE;
+ virtual void postProgressEstimateChangedNotification() OVERRIDE;
+ virtual void postProgressFinishedNotification() OVERRIDE;
+ virtual void loadURLExternally(const WebCore::ResourceRequest&, WebCore::NavigationPolicy, const String& suggestedName = String()) OVERRIDE;
+ virtual bool navigateBackForward(int offset) const OVERRIDE;
+ virtual void didAccessInitialDocument() OVERRIDE;
+ virtual void didDisownOpener() OVERRIDE;
+ virtual void didDisplayInsecureContent() OVERRIDE;
+ virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL& insecureURL) OVERRIDE;
+ virtual void didDetectXSS(const WebCore::KURL&, bool didBlockEntirePage) OVERRIDE;
+ virtual void didDispatchPingLoader(const WebCore::KURL&) OVERRIDE;
+ virtual void selectorMatchChanged(const Vector<String>& addedSelectors, const Vector<String>& removedSelectors) OVERRIDE;
+ virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(WebCore::Frame*, const WebCore::ResourceRequest&, const WebCore::SubstituteData&) OVERRIDE;
+ virtual WTF::String userAgent(const WebCore::KURL&) OVERRIDE;
+ virtual WTF::String doNotTrackValue() OVERRIDE;
+ virtual void transitionToCommittedForNewPage() OVERRIDE;
+ virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL&, const WTF::AtomicString& name, const WTF::String& referrer, WebCore::HTMLFrameOwnerElement*) OVERRIDE;
virtual PassRefPtr<WebCore::Widget> createPlugin(
const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&,
const Vector<WTF::String>&, const Vector<WTF::String>&,
- const WTF::String&, bool loadManually);
+ const WTF::String&, bool loadManually) OVERRIDE;
virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(
const WebCore::IntSize&,
WebCore::HTMLAppletElement*,
const WebCore::KURL& /* base_url */,
const Vector<WTF::String>& paramNames,
- const Vector<WTF::String>& paramValues);
+ const Vector<WTF::String>& paramValues) OVERRIDE;
virtual WebCore::ObjectContentType objectContentType(
- const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
- virtual void didChangeScrollOffset();
- virtual bool allowScript(bool enabledPerSettings);
- virtual bool allowScriptFromSource(bool enabledPerSettings, const WebCore::KURL& scriptURL);
- virtual bool allowPlugins(bool enabledPerSettings);
- virtual bool allowImage(bool enabledPerSettings, const WebCore::KURL& imageURL);
- virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, WebCore::SecurityOrigin*, const WebCore::KURL&);
- virtual bool allowRunningInsecureContent(bool enabledPerSettings, WebCore::SecurityOrigin*, const WebCore::KURL&);
- virtual void didNotAllowScript();
- virtual void didNotAllowPlugins();
-
- virtual WebCookieJar* cookieJar() const;
- virtual bool willCheckAndDispatchMessageEvent(WebCore::SecurityOrigin* target, WebCore::MessageEvent*) const;
- virtual void didChangeName(const String&);
+ const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) OVERRIDE;
+ virtual void didChangeScrollOffset() OVERRIDE;
+ virtual bool allowScript(bool enabledPerSettings) OVERRIDE;
+ virtual bool allowScriptFromSource(bool enabledPerSettings, const WebCore::KURL& scriptURL) OVERRIDE;
+ virtual bool allowPlugins(bool enabledPerSettings) OVERRIDE;
+ virtual bool allowImage(bool enabledPerSettings, const WebCore::KURL& imageURL) OVERRIDE;
+ virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, WebCore::SecurityOrigin*, const WebCore::KURL&) OVERRIDE;
+ virtual bool allowRunningInsecureContent(bool enabledPerSettings, WebCore::SecurityOrigin*, const WebCore::KURL&) OVERRIDE;
+ virtual void didNotAllowScript() OVERRIDE;
+ virtual void didNotAllowPlugins() OVERRIDE;
+
+ virtual WebCookieJar* cookieJar() const OVERRIDE;
+ virtual bool willCheckAndDispatchMessageEvent(WebCore::SecurityOrigin* target, WebCore::MessageEvent*) const OVERRIDE;
+ virtual void didChangeName(const String&) OVERRIDE;
virtual void dispatchWillOpenSocketStream(WebCore::SocketStreamHandle*) OVERRIDE;
« no previous file with comments | « Source/web/ExternalPopupMenu.h ('k') | Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698