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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/ChromeClientImpl.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/BackForwardClientImpl.h ('k') | Source/web/ColorChooserPopupUIController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ChromeClientImpl.h
diff --git a/Source/web/ChromeClientImpl.h b/Source/web/ChromeClientImpl.h
index 6e66773d5029d580c4b844da348400bb3a033912..9c54d27891e596674b949736f0591bdf357f7bef 100644
--- a/Source/web/ChromeClientImpl.h
+++ b/Source/web/ChromeClientImpl.h
@@ -65,103 +65,103 @@ struct WebCursorInfo;
struct WebPopupMenuInfo;
// Handles window-level notifications from WebCore on behalf of a WebView.
-class ChromeClientImpl : public WebCore::ChromeClient {
+class ChromeClientImpl FINAL : public WebCore::ChromeClient {
public:
explicit ChromeClientImpl(WebViewImpl* webView);
virtual ~ChromeClientImpl();
- virtual void* webView() const;
+ virtual void* webView() const OVERRIDE;
// ChromeClient methods:
- virtual void chromeDestroyed();
- virtual void setWindowRect(const WebCore::FloatRect&);
- virtual WebCore::FloatRect windowRect();
- virtual WebCore::FloatRect pageRect();
- virtual void focus();
- virtual void unfocus();
- virtual bool canTakeFocus(WebCore::FocusDirection);
- virtual void takeFocus(WebCore::FocusDirection);
- virtual void focusedNodeChanged(WebCore::Node*);
+ virtual void chromeDestroyed() OVERRIDE;
+ virtual void setWindowRect(const WebCore::FloatRect&) OVERRIDE;
+ virtual WebCore::FloatRect windowRect() OVERRIDE;
+ virtual WebCore::FloatRect pageRect() OVERRIDE;
+ virtual void focus() OVERRIDE;
+ virtual void unfocus() OVERRIDE;
+ virtual bool canTakeFocus(WebCore::FocusDirection) OVERRIDE;
+ virtual void takeFocus(WebCore::FocusDirection) OVERRIDE;
+ virtual void focusedNodeChanged(WebCore::Node*) OVERRIDE;
virtual WebCore::Page* createWindow(
- WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, WebCore::NavigationPolicy, WebCore::ShouldSendReferrer);
- virtual void show(WebCore::NavigationPolicy);
- virtual bool canRunModal();
- virtual void runModal();
- virtual void setToolbarsVisible(bool);
- virtual bool toolbarsVisible();
- virtual void setStatusbarVisible(bool);
- virtual bool statusbarVisible();
- virtual void setScrollbarsVisible(bool);
- virtual bool scrollbarsVisible();
- virtual void setMenubarVisible(bool);
- virtual bool menubarVisible();
- virtual void setResizable(bool);
- virtual bool shouldReportDetailedMessageForSource(const WTF::String&);
+ WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, WebCore::NavigationPolicy, WebCore::ShouldSendReferrer) OVERRIDE;
+ virtual void show(WebCore::NavigationPolicy) OVERRIDE;
+ virtual bool canRunModal() OVERRIDE;
+ virtual void runModal() OVERRIDE;
+ virtual void setToolbarsVisible(bool) OVERRIDE;
+ virtual bool toolbarsVisible() OVERRIDE;
+ virtual void setStatusbarVisible(bool) OVERRIDE;
+ virtual bool statusbarVisible() OVERRIDE;
+ virtual void setScrollbarsVisible(bool) OVERRIDE;
+ virtual bool scrollbarsVisible() OVERRIDE;
+ virtual void setMenubarVisible(bool) OVERRIDE;
+ virtual bool menubarVisible() OVERRIDE;
+ virtual void setResizable(bool) OVERRIDE;
+ virtual bool shouldReportDetailedMessageForSource(const WTF::String&) OVERRIDE;
virtual void addMessageToConsole(
WebCore::MessageSource, WebCore::MessageLevel,
const WTF::String& message, unsigned lineNumber,
- const WTF::String& sourceID, const WTF::String& stackTrace);
- virtual bool canRunBeforeUnloadConfirmPanel();
+ const WTF::String& sourceID, const WTF::String& stackTrace) OVERRIDE;
+ virtual bool canRunBeforeUnloadConfirmPanel() OVERRIDE;
virtual bool runBeforeUnloadConfirmPanel(
- const WTF::String& message, WebCore::Frame*);
- virtual void closeWindowSoon();
- virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&);
- virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&);
+ const WTF::String& message, WebCore::Frame*) OVERRIDE;
+ virtual void closeWindowSoon() OVERRIDE;
+ virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) OVERRIDE;
+ virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) OVERRIDE;
virtual bool runJavaScriptPrompt(
WebCore::Frame*, const WTF::String& message,
- const WTF::String& defaultValue, WTF::String& result);
- virtual void setStatusbarText(const WTF::String& message);
- virtual bool tabsToLinks();
- virtual WebCore::IntRect windowResizerRect() const;
- virtual void invalidateContentsAndRootView(const WebCore::IntRect&);
- virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&);
- virtual void scheduleAnimation();
+ const WTF::String& defaultValue, WTF::String& result) OVERRIDE;
+ virtual void setStatusbarText(const WTF::String& message) OVERRIDE;
+ virtual bool tabsToLinks() OVERRIDE;
+ virtual WebCore::IntRect windowResizerRect() const OVERRIDE;
+ virtual void invalidateContentsAndRootView(const WebCore::IntRect&) OVERRIDE;
+ virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&) OVERRIDE;
+ virtual void scheduleAnimation() OVERRIDE;
virtual void scroll(
const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll,
- const WebCore::IntRect& clipRect);
- virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const;
- virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const;
- virtual WebScreenInfo screenInfo() const;
- virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
- virtual void deviceOrPageScaleFactorChanged() const;
- virtual void layoutUpdated(WebCore::Frame*) const;
+ const WebCore::IntRect& clipRect) OVERRIDE;
+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const OVERRIDE;
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const OVERRIDE;
+ virtual WebScreenInfo screenInfo() const OVERRIDE;
+ virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const OVERRIDE;
+ virtual void deviceOrPageScaleFactorChanged() const OVERRIDE;
+ virtual void layoutUpdated(WebCore::Frame*) const OVERRIDE;
virtual void mouseDidMoveOverElement(
- const WebCore::HitTestResult& result, unsigned modifierFlags);
- virtual void setToolTip(const WTF::String& tooltipText, WebCore::TextDirection);
- virtual void dispatchViewportPropertiesDidChange(const WebCore::ViewportDescription&) const;
- virtual void print(WebCore::Frame*);
- virtual void annotatedRegionsChanged();
- virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&);
+ const WebCore::HitTestResult&, unsigned modifierFlags) OVERRIDE;
+ virtual void setToolTip(const WTF::String& tooltipText, WebCore::TextDirection) OVERRIDE;
+ virtual void dispatchViewportPropertiesDidChange(const WebCore::ViewportDescription&) const OVERRIDE;
+ virtual void print(WebCore::Frame*) OVERRIDE;
+ virtual void annotatedRegionsChanged() OVERRIDE;
+ virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE;
virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE;
virtual PassRefPtr<WebCore::DateTimeChooser> openDateTimeChooser(WebCore::DateTimeChooserClient*, const WebCore::DateTimeChooserParameters&) OVERRIDE;
virtual void openTextDataListChooser(WebCore::HTMLInputElement&) OVERRIDE;
- virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
- virtual void enumerateChosenDirectory(WebCore::FileChooser*);
- virtual void setCursor(const WebCore::Cursor&);
- virtual void formStateDidChange(const WebCore::Node*);
+ virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) OVERRIDE;
+ virtual void enumerateChosenDirectory(WebCore::FileChooser*) OVERRIDE;
+ virtual void setCursor(const WebCore::Cursor&) OVERRIDE;
+ virtual void formStateDidChange(const WebCore::Node*) OVERRIDE;
virtual void needTouchEvents(bool needTouchEvents) OVERRIDE;
virtual void setTouchAction(WebCore::TouchAction) OVERRIDE;
virtual WebCore::GraphicsLayerFactory* graphicsLayerFactory() const OVERRIDE;
// Pass 0 as the GraphicsLayer to detatch the root layer.
- virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*);
+ virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) OVERRIDE;
// Sets a flag to specify that the view needs to be updated, so we need
// to do an eager layout before the drawing.
- virtual void scheduleCompositingLayerFlush();
+ virtual void scheduleCompositingLayerFlush() OVERRIDE;
- virtual CompositingTriggerFlags allowedCompositingTriggers() const;
+ virtual CompositingTriggerFlags allowedCompositingTriggers() const OVERRIDE;
- virtual void enterFullScreenForElement(WebCore::Element*);
- virtual void exitFullScreenForElement(WebCore::Element*);
+ virtual void enterFullScreenForElement(WebCore::Element*) OVERRIDE;
+ virtual void exitFullScreenForElement(WebCore::Element*) OVERRIDE;
// ChromeClient methods:
virtual void popupOpened(WebCore::PopupContainer* popupContainer,
- const WebCore::IntRect& bounds,
- bool handleExternally);
- virtual void popupClosed(WebCore::PopupContainer* popupContainer);
- virtual void postAccessibilityNotification(WebCore::AXObject*, WebCore::AXObjectCache::AXNotification);
+ const WebCore::IntRect& bounds,
+ bool handleExternally) OVERRIDE;
+ virtual void popupClosed(WebCore::PopupContainer*) OVERRIDE;
+ virtual void postAccessibilityNotification(WebCore::AXObject*, WebCore::AXObjectCache::AXNotification) OVERRIDE;
virtual String acceptLanguages() OVERRIDE;
// ChromeClientImpl:
@@ -169,7 +169,7 @@ public:
void setNewWindowNavigationPolicy(WebNavigationPolicy);
virtual bool hasOpenedPopup() const OVERRIDE;
- virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::Frame&, WebCore::PopupMenuClient*) const;
+ virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::Frame&, WebCore::PopupMenuClient*) const OVERRIDE;
virtual WebCore::PagePopup* openPagePopup(WebCore::PagePopupClient*, const WebCore::IntRect&) OVERRIDE;
virtual void closePagePopup(WebCore::PagePopup*) OVERRIDE;
virtual void setPagePopupDriver(WebCore::PagePopupDriver*) OVERRIDE;
@@ -178,14 +178,14 @@ public:
virtual bool isPasswordGenerationEnabled() const OVERRIDE;
virtual void openPasswordGenerator(WebCore::HTMLInputElement*) OVERRIDE;
- virtual bool shouldRunModalDialogDuringPageDismissal(const DialogType&, const String& dialogMessage, WebCore::Document::PageDismissalType) const;
+ virtual bool shouldRunModalDialogDuringPageDismissal(const DialogType&, const String& dialogMessage, WebCore::Document::PageDismissalType) const OVERRIDE;
- virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const;
- virtual void numWheelEventHandlersChanged(unsigned);
+ virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const OVERRIDE;
+ virtual void numWheelEventHandlersChanged(unsigned) OVERRIDE;
- virtual bool requestPointerLock();
- virtual void requestPointerUnlock();
- virtual bool isPointerLocked();
+ virtual bool requestPointerLock() OVERRIDE;
+ virtual void requestPointerUnlock() OVERRIDE;
+ virtual bool isPointerLocked() OVERRIDE;
virtual void didAssociateFormControls(const Vector<RefPtr<WebCore::Element> >&) OVERRIDE;
virtual void didChangeValueInTextField(WebCore::HTMLInputElement&) OVERRIDE;
@@ -212,10 +212,10 @@ private:
WebCore::PagePopupDriver* m_pagePopupDriver;
};
-class NavigatorContentUtilsClientImpl : public WebCore::NavigatorContentUtilsClient {
+class NavigatorContentUtilsClientImpl FINAL : public WebCore::NavigatorContentUtilsClient {
public:
static PassOwnPtr<NavigatorContentUtilsClientImpl> create(WebViewImpl*);
- ~NavigatorContentUtilsClientImpl() { }
+ virtual ~NavigatorContentUtilsClientImpl() { }
virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title) OVERRIDE;
virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const String& baseURL, const String& url) OVERRIDE;
« no previous file with comments | « Source/web/BackForwardClientImpl.h ('k') | Source/web/ColorChooserPopupUIController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698