| Index: ui/views/controls/scrollbar/base_scroll_bar.h
|
| diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h
|
| index 068ad4ddb6f0a35db3f7603b75518b3ba39d64f4..b68e22a691974ca43d53ab284da630b18062b950 100644
|
| --- a/ui/views/controls/scrollbar/base_scroll_bar.h
|
| +++ b/ui/views/controls/scrollbar/base_scroll_bar.h
|
| @@ -64,42 +64,42 @@ class VIEWS_EXPORT BaseScrollBar : public ScrollBar,
|
| CustomButton::ButtonState new_state);
|
|
|
| // View overrides:
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE = 0;
|
| - virtual void Layout() OVERRIDE = 0;
|
| - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseCaptureLost() OVERRIDE;
|
| - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const override = 0;
|
| + virtual void Layout() override = 0;
|
| + virtual bool OnMousePressed(const ui::MouseEvent& event) override;
|
| + virtual void OnMouseReleased(const ui::MouseEvent& event) override;
|
| + virtual void OnMouseCaptureLost() override;
|
| + virtual void OnMouseEntered(const ui::MouseEvent& event) override;
|
| + virtual void OnMouseExited(const ui::MouseEvent& event) override;
|
| + virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
|
| + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
|
|
|
| // ui::EventHandler overrides:
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| // ScrollBar overrides:
|
| virtual void Update(int viewport_size,
|
| int content_size,
|
| - int contents_scroll_offset) OVERRIDE;
|
| - virtual int GetLayoutSize() const OVERRIDE = 0;
|
| - virtual int GetPosition() const OVERRIDE;
|
| + int contents_scroll_offset) override;
|
| + virtual int GetLayoutSize() const override = 0;
|
| + virtual int GetPosition() const override;
|
|
|
| // ScrollDelegate overrides:
|
| - virtual bool OnScroll(float dx, float dy) OVERRIDE;
|
| + virtual bool OnScroll(float dx, float dy) override;
|
|
|
| // ContextMenuController overrides:
|
| virtual void ShowContextMenuForView(View* source,
|
| const gfx::Point& point,
|
| - ui::MenuSourceType source_type) OVERRIDE;
|
| + ui::MenuSourceType source_type) override;
|
|
|
| // Menu::Delegate overrides:
|
| - virtual base::string16 GetLabel(int id) const OVERRIDE;
|
| - virtual bool IsCommandEnabled(int id) const OVERRIDE;
|
| - virtual void ExecuteCommand(int id) OVERRIDE;
|
| + virtual base::string16 GetLabel(int id) const override;
|
| + virtual bool IsCommandEnabled(int id) const override;
|
| + virtual void ExecuteCommand(int id) override;
|
|
|
| protected:
|
| // View overrides:
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE = 0;
|
| + virtual void OnPaint(gfx::Canvas* canvas) override = 0;
|
|
|
| BaseScrollBarThumb* GetThumb() const;
|
| CustomButton::ButtonState GetThumbTrackState() const;
|
|
|