Index: ui/views/controls/menu/menu_scroll_view_container.cc |
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc |
index 451bd1537ad5b4cf5d66b8f552ede0800c1d8b5f..2d3db74126ae32a37b33e27240ffcc3aec9cc843 100644 |
--- a/ui/views/controls/menu/menu_scroll_view_container.cc |
+++ b/ui/views/controls/menu/menu_scroll_view_container.cc |
@@ -40,37 +40,37 @@ class MenuScrollButton : public View { |
pref_height_(MenuItemView::pref_menu_height()) { |
} |
- virtual gfx::Size GetPreferredSize() const OVERRIDE { |
+ virtual gfx::Size GetPreferredSize() const override { |
return gfx::Size( |
host_->GetMenuItem()->GetMenuConfig().scroll_arrow_height * 2 - 1, |
pref_height_); |
} |
- virtual bool CanDrop(const OSExchangeData& data) OVERRIDE { |
+ virtual bool CanDrop(const OSExchangeData& data) override { |
DCHECK(host_->GetMenuItem()->GetMenuController()); |
return true; // Always return true so that drop events are targeted to us. |
} |
- virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE { |
+ virtual void OnDragEntered(const ui::DropTargetEvent& event) override { |
DCHECK(host_->GetMenuItem()->GetMenuController()); |
host_->GetMenuItem()->GetMenuController()->OnDragEnteredScrollButton( |
host_, is_up_); |
} |
- virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE { |
+ virtual int OnDragUpdated(const ui::DropTargetEvent& event) override { |
return ui::DragDropTypes::DRAG_NONE; |
} |
- virtual void OnDragExited() OVERRIDE { |
+ virtual void OnDragExited() override { |
DCHECK(host_->GetMenuItem()->GetMenuController()); |
host_->GetMenuItem()->GetMenuController()->OnDragExitedScrollButton(host_); |
} |
- virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE { |
+ virtual int OnPerformDrop(const ui::DropTargetEvent& event) override { |
return ui::DragDropTypes::DRAG_NONE; |
} |
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { |
+ virtual void OnPaint(gfx::Canvas* canvas) override { |
const MenuConfig& config = host_->GetMenuItem()->GetMenuConfig(); |
// The background. |
@@ -139,7 +139,7 @@ class MenuScrollViewContainer::MenuScrollView : public View { |
AddChildView(child); |
} |
- virtual void ScrollRectToVisible(const gfx::Rect& rect) OVERRIDE { |
+ virtual void ScrollRectToVisible(const gfx::Rect& rect) override { |
// NOTE: this assumes we only want to scroll in the y direction. |
// If the rect is already visible, do not scroll. |