Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: ui/views/controls/menu/submenu_view.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/menu/native_menu_win.h ('k') | ui/views/controls/message_box_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1b7d36243d2bcbf035366f68bd385e53acb49047..c475988d0b1336ffdf6718b6664e30bdf3000e54 100644
--- a/ui/views/controls/menu/submenu_view.h
+++ b/ui/views/controls/menu/submenu_view.h
@@ -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;
+ virtual void Layout() override;
+ virtual gfx::Size GetPreferredSize() const override;
// Override from View.
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
- virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
+ virtual void GetAccessibleState(ui::AXViewState* state) override;
+ virtual ui::TextInputClient* GetTextInputClient() override;
// Painting.
virtual void PaintChildren(gfx::Canvas* canvas,
- const views::CullSet& cull_view) OVERRIDE;
+ const views::CullSet& cull_view) override;
// Drag and drop methods. These are forwarded to the MenuController.
virtual 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;
+ 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;
// Scrolls on menu item boundaries.
- virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) OVERRIDE;
+ virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
// Overridden from ui::EventHandler.
// Scrolls on menu item boundaries.
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+ virtual 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;
+ virtual int GetRowCount() override;
+ virtual int GetSelectedRow() override;
+ virtual void SetSelectedRow(int row) override;
+ virtual 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;
+ virtual 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;
+ virtual 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;
+ virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
- virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
+ virtual 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;
+ virtual bool OnScroll(float dx, float dy) override;
// Parent menu item.
MenuItemView* parent_menu_item_;
« no previous file with comments | « ui/views/controls/menu/native_menu_win.h ('k') | ui/views/controls/message_box_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698