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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/ChromeClientImpl.h

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 e3104d6fd6941052cdc511f22dfc0c6a3f631b98..c139396aa9a7524c2c547ce9c8d4af6e2225b9b2 100644
--- a/Source/web/ChromeClientImpl.h
+++ b/Source/web/ChromeClientImpl.h
@@ -64,126 +64,126 @@ struct WebPopupMenuInfo;
struct WindowFeatures;
// Handles window-level notifications from WebCore on behalf of a WebView.
-class ChromeClientImpl FINAL : public ChromeClient {
+class ChromeClientImpl final : public ChromeClient {
public:
explicit ChromeClientImpl(WebViewImpl* webView);
virtual ~ChromeClientImpl();
- virtual void* webView() const OVERRIDE;
+ virtual void* webView() const override;
// ChromeClient methods:
- virtual void chromeDestroyed() OVERRIDE;
- virtual void setWindowRect(const FloatRect&) OVERRIDE;
- virtual FloatRect windowRect() OVERRIDE;
- virtual FloatRect pageRect() OVERRIDE;
- virtual void focus() OVERRIDE;
- virtual bool canTakeFocus(FocusType) OVERRIDE;
- virtual void takeFocus(FocusType) OVERRIDE;
- virtual void focusedNodeChanged(Node*) OVERRIDE;
- virtual void focusedFrameChanged(LocalFrame*) OVERRIDE;
+ virtual void chromeDestroyed() override;
+ virtual void setWindowRect(const FloatRect&) override;
+ virtual FloatRect windowRect() override;
+ virtual FloatRect pageRect() override;
+ virtual void focus() override;
+ virtual bool canTakeFocus(FocusType) override;
+ virtual void takeFocus(FocusType) override;
+ virtual void focusedNodeChanged(Node*) override;
+ virtual void focusedFrameChanged(LocalFrame*) override;
virtual Page* createWindow(
- LocalFrame*, const FrameLoadRequest&, const WindowFeatures&, NavigationPolicy, ShouldSendReferrer) OVERRIDE;
- virtual void show(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;
+ LocalFrame*, const FrameLoadRequest&, const WindowFeatures&, NavigationPolicy, ShouldSendReferrer) override;
+ virtual void show(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(
LocalFrame*, MessageSource, MessageLevel,
const WTF::String& message, unsigned lineNumber,
- const WTF::String& sourceID, const WTF::String& stackTrace) OVERRIDE;
- virtual bool canRunBeforeUnloadConfirmPanel() OVERRIDE;
+ const WTF::String& sourceID, const WTF::String& stackTrace) override;
+ virtual bool canRunBeforeUnloadConfirmPanel() override;
virtual bool runBeforeUnloadConfirmPanel(
- const WTF::String& message, LocalFrame*) OVERRIDE;
- virtual void closeWindowSoon() OVERRIDE;
- virtual void runJavaScriptAlert(LocalFrame*, const WTF::String&) OVERRIDE;
- virtual bool runJavaScriptConfirm(LocalFrame*, const WTF::String&) OVERRIDE;
+ const WTF::String& message, LocalFrame*) override;
+ virtual void closeWindowSoon() override;
+ virtual void runJavaScriptAlert(LocalFrame*, const WTF::String&) override;
+ virtual bool runJavaScriptConfirm(LocalFrame*, const WTF::String&) override;
virtual bool runJavaScriptPrompt(
LocalFrame*, const WTF::String& message,
- const WTF::String& defaultValue, WTF::String& result) OVERRIDE;
- virtual void setStatusbarText(const WTF::String& message) OVERRIDE;
- virtual bool tabsToLinks() OVERRIDE;
- virtual IntRect windowResizerRect() const OVERRIDE;
- virtual void invalidateContentsAndRootView(const IntRect&) OVERRIDE;
- virtual void invalidateContentsForSlowScroll(const IntRect&) OVERRIDE;
- virtual void scheduleAnimation() OVERRIDE;
- virtual IntRect rootViewToScreen(const IntRect&) const OVERRIDE;
- virtual WebScreenInfo screenInfo() const OVERRIDE;
- virtual void contentsSizeChanged(LocalFrame*, const IntSize&) const OVERRIDE;
- virtual void deviceOrPageScaleFactorChanged() const OVERRIDE;
- virtual void layoutUpdated(LocalFrame*) const OVERRIDE;
+ const WTF::String& defaultValue, WTF::String& result) override;
+ virtual void setStatusbarText(const WTF::String& message) override;
+ virtual bool tabsToLinks() override;
+ virtual IntRect windowResizerRect() const override;
+ virtual void invalidateContentsAndRootView(const IntRect&) override;
+ virtual void invalidateContentsForSlowScroll(const IntRect&) override;
+ virtual void scheduleAnimation() override;
+ virtual IntRect rootViewToScreen(const IntRect&) const override;
+ virtual WebScreenInfo screenInfo() const override;
+ virtual void contentsSizeChanged(LocalFrame*, const IntSize&) const override;
+ virtual void deviceOrPageScaleFactorChanged() const override;
+ virtual void layoutUpdated(LocalFrame*) const override;
virtual void mouseDidMoveOverElement(
- const HitTestResult&, unsigned modifierFlags) OVERRIDE;
- virtual void setToolTip(const WTF::String& tooltipText, TextDirection) OVERRIDE;
- virtual void dispatchViewportPropertiesDidChange(const ViewportDescription&) const OVERRIDE;
- virtual void print(LocalFrame*) OVERRIDE;
- virtual void annotatedRegionsChanged() OVERRIDE;
- virtual bool paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&) OVERRIDE;
- virtual PassOwnPtr<ColorChooser> createColorChooser(LocalFrame*, ColorChooserClient*, const Color&) OVERRIDE;
- virtual PassRefPtr<DateTimeChooser> openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) OVERRIDE;
- virtual void openTextDataListChooser(HTMLInputElement&) OVERRIDE;
- virtual void runOpenPanel(LocalFrame*, PassRefPtr<FileChooser>) OVERRIDE;
- virtual void enumerateChosenDirectory(FileChooser*) OVERRIDE;
- virtual void setCursor(const Cursor&) OVERRIDE;
- virtual void needTouchEvents(bool needTouchEvents) OVERRIDE;
- virtual void setTouchAction(TouchAction) OVERRIDE;
-
- virtual GraphicsLayerFactory* graphicsLayerFactory() const OVERRIDE;
+ const HitTestResult&, unsigned modifierFlags) override;
+ virtual void setToolTip(const WTF::String& tooltipText, TextDirection) override;
+ virtual void dispatchViewportPropertiesDidChange(const ViewportDescription&) const override;
+ virtual void print(LocalFrame*) override;
+ virtual void annotatedRegionsChanged() override;
+ virtual bool paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&) override;
+ virtual PassOwnPtr<ColorChooser> createColorChooser(LocalFrame*, ColorChooserClient*, const Color&) override;
+ virtual PassRefPtr<DateTimeChooser> openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) override;
+ virtual void openTextDataListChooser(HTMLInputElement&) override;
+ virtual void runOpenPanel(LocalFrame*, PassRefPtr<FileChooser>) override;
+ virtual void enumerateChosenDirectory(FileChooser*) override;
+ virtual void setCursor(const Cursor&) override;
+ virtual void needTouchEvents(bool needTouchEvents) override;
+ virtual void setTouchAction(TouchAction) override;
+
+ virtual GraphicsLayerFactory* graphicsLayerFactory() const override;
// Pass 0 as the GraphicsLayer to detatch the root layer.
- virtual void attachRootGraphicsLayer(GraphicsLayer*) OVERRIDE;
+ virtual void attachRootGraphicsLayer(GraphicsLayer*) override;
- virtual void enterFullScreenForElement(Element*) OVERRIDE;
- virtual void exitFullScreenForElement(Element*) OVERRIDE;
+ virtual void enterFullScreenForElement(Element*) override;
+ virtual void exitFullScreenForElement(Element*) override;
- virtual void clearCompositedSelectionBounds() OVERRIDE;
- virtual void updateCompositedSelectionBounds(const blink::CompositedSelectionBound& anchor, const blink::CompositedSelectionBound& focus) OVERRIDE;
+ virtual void clearCompositedSelectionBounds() override;
+ virtual void updateCompositedSelectionBounds(const blink::CompositedSelectionBound& anchor, const blink::CompositedSelectionBound& focus) override;
// ChromeClient methods:
- virtual void postAccessibilityNotification(AXObject*, AXObjectCache::AXNotification) OVERRIDE;
- virtual String acceptLanguages() OVERRIDE;
+ virtual void postAccessibilityNotification(AXObject*, AXObjectCache::AXNotification) override;
+ virtual String acceptLanguages() override;
// ChromeClientImpl:
void setCursorForPlugin(const WebCursorInfo&);
void setNewWindowNavigationPolicy(WebNavigationPolicy);
- virtual bool hasOpenedPopup() const OVERRIDE;
- virtual PassRefPtrWillBeRawPtr<PopupMenu> createPopupMenu(LocalFrame&, PopupMenuClient*) const OVERRIDE;
+ virtual bool hasOpenedPopup() const override;
+ virtual PassRefPtrWillBeRawPtr<PopupMenu> createPopupMenu(LocalFrame&, PopupMenuClient*) const override;
PagePopup* openPagePopup(PagePopupClient*, const IntRect&);
void closePagePopup(PagePopup*);
- virtual void setPagePopupDriver(PagePopupDriver*) OVERRIDE;
- virtual void resetPagePopupDriver() OVERRIDE;
- virtual PagePopupDriver* pagePopupDriver() const OVERRIDE { return m_pagePopupDriver; }
+ virtual void setPagePopupDriver(PagePopupDriver*) override;
+ virtual void resetPagePopupDriver() override;
+ virtual PagePopupDriver* pagePopupDriver() const override { return m_pagePopupDriver; }
- virtual bool shouldRunModalDialogDuringPageDismissal(const DialogType&, const String& dialogMessage, Document::PageDismissalType) const OVERRIDE;
+ virtual bool shouldRunModalDialogDuringPageDismissal(const DialogType&, const String& dialogMessage, Document::PageDismissalType) const override;
- virtual bool requestPointerLock() OVERRIDE;
- virtual void requestPointerUnlock() OVERRIDE;
+ virtual bool requestPointerLock() override;
+ virtual void requestPointerUnlock() override;
- virtual void didAssociateFormControls(const WillBeHeapVector<RefPtrWillBeMember<Element> >&) OVERRIDE;
- virtual void didChangeValueInTextField(HTMLFormControlElement&) OVERRIDE;
- virtual void didEndEditingOnTextField(HTMLInputElement&) OVERRIDE;
- virtual void handleKeyboardEventOnTextField(HTMLInputElement&, KeyboardEvent&) OVERRIDE;
+ virtual void didAssociateFormControls(const WillBeHeapVector<RefPtrWillBeMember<Element> >&) override;
+ virtual void didChangeValueInTextField(HTMLFormControlElement&) override;
+ virtual void didEndEditingOnTextField(HTMLInputElement&) override;
+ virtual void handleKeyboardEventOnTextField(HTMLInputElement&, KeyboardEvent&) override;
// FIXME: Remove this method once we have input routing in the browser
// process. See http://crbug.com/339659.
- virtual void forwardInputEvent(Frame*, Event*) OVERRIDE;
+ virtual void forwardInputEvent(Frame*, Event*) override;
- virtual void didCancelCompositionOnSelectionChange() OVERRIDE;
- virtual void willSetInputMethodState() OVERRIDE;
- virtual void didUpdateTextOfFocusedElementByNonUserInput() OVERRIDE;
- virtual void showImeIfNeeded() OVERRIDE;
+ virtual void didCancelCompositionOnSelectionChange() override;
+ virtual void willSetInputMethodState() override;
+ virtual void didUpdateTextOfFocusedElementByNonUserInput() override;
+ virtual void showImeIfNeeded() override;
private:
- virtual bool isChromeClientImpl() const OVERRIDE { return true; }
+ virtual bool isChromeClientImpl() const override { return true; }
WebNavigationPolicy getNavigationPolicy();
void setCursor(const WebCursorInfo&);
« 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