Replacing the OVERRIDE with override in third_party/WebKit/Source/platform

Source/platform/scroll/Scrollbar.h

 /*
  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 33 matching lines @@
 
 class PLATFORM_EXPORT Scrollbar : public Widget,
                   public ScrollbarThemeClient {
 
 public:
     static PassRefPtr<Scrollbar> create(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize);
 
     virtual ~Scrollbar();
 
     // ScrollbarThemeClient implementation.
-    virtual int x() const OVERRIDE { return Widget::x(); }
-    virtual int y() const OVERRIDE { return Widget::y(); }
-    virtual int width() const OVERRIDE { return Widget::width(); }
-    virtual int height() const OVERRIDE { return Widget::height(); }
-    virtual IntSize size() const OVERRIDE { return Widget::size(); }
-    virtual IntPoint location() const OVERRIDE { return Widget::location(); }
+    virtual int x() const override { return Widget::x(); }
+    virtual int y() const override { return Widget::y(); }
+    virtual int width() const override { return Widget::width(); }
+    virtual int height() const override { return Widget::height(); }
+    virtual IntSize size() const override { return Widget::size(); }
+    virtual IntPoint location() const override { return Widget::location(); }
 
-    virtual Widget* parent() const OVERRIDE { return Widget::parent(); }
-    virtual Widget* root() const OVERRIDE { return Widget::root(); }
+    virtual Widget* parent() const override { return Widget::parent(); }
+    virtual Widget* root() const override { return Widget::root(); }
 
-    virtual void setFrameRect(const IntRect& frameRect) OVERRIDE { Widget::setFrameRect(frameRect); }
-    virtual IntRect frameRect() const OVERRIDE { return Widget::frameRect(); }
+    virtual void setFrameRect(const IntRect& frameRect) override { Widget::setFrameRect(frameRect); }
+    virtual IntRect frameRect() const override { return Widget::frameRect(); }
 
-    virtual void invalidate() OVERRIDE { Widget::invalidate(); }
-    virtual void invalidateRect(const IntRect&) OVERRIDE;
+    virtual void invalidate() override { Widget::invalidate(); }
+    virtual void invalidateRect(const IntRect&) override;
 
-    virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const OVERRIDE;
-    virtual void getTickmarks(Vector<IntRect>&) const OVERRIDE;
-    virtual bool isScrollableAreaActive() const OVERRIDE;
-    virtual bool isScrollViewScrollbar() const OVERRIDE;
+    virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const override;
+    virtual void getTickmarks(Vector<IntRect>&) const override;
+    virtual bool isScrollableAreaActive() const override;
+    virtual bool isScrollViewScrollbar() const override;
 
-    virtual IntPoint convertFromContainingWindow(const IntPoint& windowPoint) OVERRIDE { return Widget::convertFromContainingWindow(windowPoint); }
+    virtual IntPoint convertFromContainingWindow(const IntPoint& windowPoint) override { return Widget::convertFromContainingWindow(windowPoint); }
 
-    virtual bool isCustomScrollbar() const OVERRIDE { return false; }
-    virtual ScrollbarOrientation orientation() const OVERRIDE { return m_orientation; }
-    virtual bool isLeftSideVerticalScrollbar() const OVERRIDE;
+    virtual bool isCustomScrollbar() const override { return false; }
+    virtual ScrollbarOrientation orientation() const override { return m_orientation; }
+    virtual bool isLeftSideVerticalScrollbar() const override;
 
-    virtual int value() const OVERRIDE { return lroundf(m_currentPos); }
-    virtual float currentPos() const OVERRIDE { return m_currentPos; }
-    virtual int visibleSize() const OVERRIDE { return m_visibleSize; }
-    virtual int totalSize() const OVERRIDE { return m_totalSize; }
-    virtual int maximum() const OVERRIDE { return m_totalSize - m_visibleSize; }
-    virtual ScrollbarControlSize controlSize() const OVERRIDE { return m_controlSize; }
+    virtual int value() const override { return lroundf(m_currentPos); }
+    virtual float currentPos() const override { return m_currentPos; }
+    virtual int visibleSize() const override { return m_visibleSize; }
+    virtual int totalSize() const override { return m_totalSize; }
+    virtual int maximum() const override { return m_totalSize - m_visibleSize; }
+    virtual ScrollbarControlSize controlSize() const override { return m_controlSize; }
 
-    virtual ScrollbarPart pressedPart() const OVERRIDE { return m_pressedPart; }
-    virtual ScrollbarPart hoveredPart() const OVERRIDE { return m_hoveredPart; }
+    virtual ScrollbarPart pressedPart() const override { return m_pressedPart; }
+    virtual ScrollbarPart hoveredPart() const override { return m_hoveredPart; }
 
-    virtual void styleChanged() OVERRIDE { }
+    virtual void styleChanged() override { }
 
-    virtual bool enabled() const OVERRIDE { return m_enabled; }
-    virtual void setEnabled(bool) OVERRIDE;
+    virtual bool enabled() const override { return m_enabled; }
+    virtual void setEnabled(bool) override;
 
     // Called by the ScrollableArea when the scroll offset changes.
     void offsetDidChange();
 
     void disconnectFromScrollableArea() { m_scrollableArea = 0; }
     ScrollableArea* scrollableArea() const { return m_scrollableArea; }
 
     int pressedPos() const { return m_pressedPos; }
 
     virtual void setHoveredPart(ScrollbarPart);
     virtual void setPressedPart(ScrollbarPart);
 
     void setProportion(int visibleSize, int totalSize);
     void setPressedPos(int p) { m_pressedPos = p; }
 
-    virtual void paint(GraphicsContext*, const IntRect& damageRect) OVERRIDE;
+    virtual void paint(GraphicsContext*, const IntRect& damageRect) override;
 
-    virtual bool isOverlayScrollbar() const OVERRIDE;
+    virtual bool isOverlayScrollbar() const override;
     bool shouldParticipateInHitTesting();
 
     bool isWindowActive() const;
 
     bool gestureEvent(const PlatformGestureEvent&);
 
     // These methods are used for platform scrollbars to give :hover feedback.  They will not get called
     // when the mouse went down in a scrollbar, since it is assumed the scrollbar will start
     // grabbing all events in that case anyway.
     void mouseMoved(const PlatformMouseEvent&);
     void mouseEntered();
     void mouseExited();
 
     // Used by some platform scrollbars to know when they've been released from capture.
     void mouseUp(const PlatformMouseEvent&);
     void mouseDown(const PlatformMouseEvent&);
 
     ScrollbarTheme* theme() const { return m_theme; }
 
     bool suppressInvalidation() const { return m_suppressInvalidation; }
     void setSuppressInvalidation(bool s) { m_suppressInvalidation = s; }
 
-    virtual IntRect convertToContainingView(const IntRect&) const OVERRIDE;
-    virtual IntRect convertFromContainingView(const IntRect&) const OVERRIDE;
+    virtual IntRect convertToContainingView(const IntRect&) const override;
+    virtual IntRect convertFromContainingView(const IntRect&) const override;
 
-    virtual IntPoint convertToContainingView(const IntPoint&) const OVERRIDE;
-    virtual IntPoint convertFromContainingView(const IntPoint&) const OVERRIDE;
+    virtual IntPoint convertToContainingView(const IntPoint&) const override;
+    virtual IntPoint convertFromContainingView(const IntPoint&) const override;
 
     void moveThumb(int pos, bool draggingDocument = false);
 
-    virtual bool isAlphaLocked() const OVERRIDE { return m_isAlphaLocked; }
-    virtual void setIsAlphaLocked(bool flag) OVERRIDE { m_isAlphaLocked = flag; }
+    virtual bool isAlphaLocked() const override { return m_isAlphaLocked; }
+    virtual void setIsAlphaLocked(bool flag) override { m_isAlphaLocked = flag; }
 
     bool overlapsResizer() const { return m_overlapsResizer; }
     void setOverlapsResizer(bool overlapsResizer) { m_overlapsResizer = overlapsResizer; }
 
 protected:
     Scrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = 0);
 
     void updateThumb();
     virtual void updateThumbPosition();
     virtual void updateThumbProportion();
@@ skipping 25 matching lines @@
     bool m_enabled;
 
     Timer<Scrollbar> m_scrollTimer;
     bool m_overlapsResizer;
 
     bool m_suppressInvalidation;
 
     bool m_isAlphaLocked;
 
 private:
-    virtual bool isScrollbar() const OVERRIDE { return true; }
+    virtual bool isScrollbar() const override { return true; }
 
     float scrollableAreaCurrentPos() const;
 };
 
 DEFINE_TYPE_CASTS(Scrollbar, Widget, widget, widget->isScrollbar(), widget.isScrollbar());
 
 } // namespace blink
 
 #endif // Scrollbar_h