| Index: ui/views/controls/menu/submenu_view.h
|
| diff --git a/ui/views/controls/menu/submenu_view.h b/ui/views/controls/menu/submenu_view.h
|
| index c475988d0b1336ffdf6718b6664e30bdf3000e54..276c8ec7ce38ee631ec0bcf04d988ca6db983e7f 100644
|
| --- a/ui/views/controls/menu/submenu_view.h
|
| +++ b/ui/views/controls/menu/submenu_view.h
|
| @@ -43,7 +43,7 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate,
|
|
|
| // Creates a SubmenuView for the specified menu item.
|
| explicit SubmenuView(MenuItemView* parent);
|
| - virtual ~SubmenuView();
|
| + ~SubmenuView() override;
|
|
|
| // Returns the number of child views that are MenuItemViews.
|
| // MenuItemViews are identified by ID.
|
| @@ -54,40 +54,40 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate,
|
|
|
| // Positions and sizes the child views. This tiles the views vertically,
|
| // giving each child the available width.
|
| - virtual void Layout() override;
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| + void Layout() override;
|
| + gfx::Size GetPreferredSize() const override;
|
|
|
| // Override from View.
|
| - virtual void GetAccessibleState(ui::AXViewState* state) override;
|
| - virtual ui::TextInputClient* GetTextInputClient() override;
|
| + void GetAccessibleState(ui::AXViewState* state) override;
|
| + ui::TextInputClient* GetTextInputClient() override;
|
|
|
| // Painting.
|
| - virtual void PaintChildren(gfx::Canvas* canvas,
|
| - const views::CullSet& cull_view) override;
|
| + void PaintChildren(gfx::Canvas* canvas,
|
| + const views::CullSet& cull_view) override;
|
|
|
| // Drag and drop methods. These are forwarded to the MenuController.
|
| - virtual bool GetDropFormats(
|
| + bool GetDropFormats(
|
| int* formats,
|
| std::set<OSExchangeData::CustomFormat>* custom_formats) override;
|
| - virtual bool AreDropTypesRequired() override;
|
| - virtual bool CanDrop(const OSExchangeData& data) override;
|
| - virtual void OnDragEntered(const ui::DropTargetEvent& event) override;
|
| - virtual int OnDragUpdated(const ui::DropTargetEvent& event) override;
|
| - virtual void OnDragExited() override;
|
| - virtual int OnPerformDrop(const ui::DropTargetEvent& event) override;
|
| + bool AreDropTypesRequired() override;
|
| + bool CanDrop(const OSExchangeData& data) override;
|
| + void OnDragEntered(const ui::DropTargetEvent& event) override;
|
| + int OnDragUpdated(const ui::DropTargetEvent& event) override;
|
| + void OnDragExited() override;
|
| + int OnPerformDrop(const ui::DropTargetEvent& event) override;
|
|
|
| // Scrolls on menu item boundaries.
|
| - virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
|
| + bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
|
|
|
| // Overridden from ui::EventHandler.
|
| // Scrolls on menu item boundaries.
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| // Overridden from PrefixDelegate.
|
| - virtual int GetRowCount() override;
|
| - virtual int GetSelectedRow() override;
|
| - virtual void SetSelectedRow(int row) override;
|
| - virtual base::string16 GetTextForRow(int row) override;
|
| + int GetRowCount() override;
|
| + int GetSelectedRow() override;
|
| + void SetSelectedRow(int row) override;
|
| + base::string16 GetTextForRow(int row) override;
|
|
|
| // Returns true if the menu is showing.
|
| bool IsShowing();
|
| @@ -118,7 +118,7 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate,
|
| void ReleaseCapture();
|
|
|
| // Overriden from View to prevent tab from doing anything.
|
| - virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) override;
|
| + bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) override;
|
|
|
| // Returns the parent menu item we're showing children for.
|
| MenuItemView* GetMenuItem() const;
|
| @@ -158,13 +158,13 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate,
|
|
|
| protected:
|
| // Overridden from View:
|
| - virtual const char* GetClassName() const override;
|
| + const char* GetClassName() const override;
|
|
|
| // View method. Overridden to schedule a paint. We do this so that when
|
| // scrolling occurs, everything is repainted correctly.
|
| - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
| + void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
|
|
| - virtual void ChildPreferredSizeChanged(View* child) override;
|
| + void ChildPreferredSizeChanged(View* child) override;
|
|
|
| private:
|
| // Paints the drop indicator. This is only invoked if item is non-NULL and
|
| @@ -181,7 +181,7 @@ class VIEWS_EXPORT SubmenuView : public PrefixDelegate,
|
| MenuDelegate::DropPosition position);
|
|
|
| // Implementation of ScrollDelegate
|
| - virtual bool OnScroll(float dx, float dy) override;
|
| + bool OnScroll(float dx, float dy) override;
|
|
|
| // Parent menu item.
|
| MenuItemView* parent_menu_item_;
|
|
|