| Index: ui/views/controls/menu/menu_item_view.h
|
| diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h
|
| index 97cf2156875793529d3286d5115cd8c02fe02268..cc4150e7840372bf4dc9ffefe54903bc49388ed7 100644
|
| --- a/ui/views/controls/menu/menu_item_view.h
|
| +++ b/ui/views/controls/menu/menu_item_view.h
|
| @@ -118,8 +118,8 @@ class VIEWS_EXPORT MenuItemView : public View {
|
|
|
| // Overridden from View:
|
| virtual bool GetTooltipText(const gfx::Point& p,
|
| - base::string16* tooltip) const OVERRIDE;
|
| - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
|
| + base::string16* tooltip) const override;
|
| + virtual void GetAccessibleState(ui::AXViewState* state) override;
|
|
|
| // Returns the preferred height of menu items. This is only valid when the
|
| // menu is about to be shown.
|
| @@ -260,15 +260,15 @@ class VIEWS_EXPORT MenuItemView : public View {
|
| int GetCommand() const { return command_; }
|
|
|
| // Paints the menu item.
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| + virtual void OnPaint(gfx::Canvas* canvas) override;
|
|
|
| // Returns the preferred size of this item.
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
|
|
| // Gets the preferred height for the given |width|. This is only different
|
| // from GetPreferredSize().width() if the item has a child view with flexible
|
| // dimensions.
|
| - virtual int GetHeightForWidth(int width) const OVERRIDE;
|
| + virtual int GetHeightForWidth(int width) const override;
|
|
|
| // Return the preferred dimensions of the item in pixel.
|
| const MenuItemDimensions& GetDimensions() const;
|
| @@ -305,7 +305,7 @@ class VIEWS_EXPORT MenuItemView : public View {
|
| void ChildrenChanged();
|
|
|
| // Sizes any child views.
|
| - virtual void Layout() OVERRIDE;
|
| + virtual void Layout() override;
|
|
|
| // Returns true if the menu has mnemonics. This only useful on the root menu
|
| // item.
|
| @@ -330,9 +330,9 @@ class VIEWS_EXPORT MenuItemView : public View {
|
| // MenuRunner owns MenuItemView and should be the only one deleting it.
|
| virtual ~MenuItemView();
|
|
|
| - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
|
| + virtual void ChildPreferredSizeChanged(View* child) override;
|
|
|
| - virtual const char* GetClassName() const OVERRIDE;
|
| + virtual const char* GetClassName() const override;
|
|
|
| // Returns the preferred size (and padding) of any children.
|
| virtual gfx::Size GetChildPreferredSize() const;
|
|
|