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

Unified Diff: chrome/browser/ui/views/toolbar/chevron_menu_button.cc

Issue 680053003: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: chrome/browser/ui/views/toolbar/chevron_menu_button.cc
diff --git a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
index 66d000fa5f72bb69a12e34e32e918dd0f553666d..bdd15e1dd20292e29f40b16728883b16c8e13d1b 100644
--- a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
@@ -43,12 +43,10 @@ class IconUpdater : public ExtensionActionIconFactory::Observer {
DCHECK(view_controller);
view_controller->set_icon_observer(this);
}
- virtual ~IconUpdater() {
- view_controller_->set_icon_observer(NULL);
- }
+ ~IconUpdater() override { view_controller_->set_icon_observer(NULL); }
// BrowserActionView::IconObserver:
- virtual void OnIconUpdated() override {
+ void OnIconUpdated() override {
menu_item_view_->SetIcon(view_controller_->GetIconWithBadge());
}
@@ -71,7 +69,7 @@ class ChevronMenuButton::MenuController : public views::MenuDelegate {
MenuController(ChevronMenuButton* owner,
BrowserActionsContainer* browser_actions_container,
bool for_drop);
- virtual ~MenuController();
+ ~MenuController() override;
// Shows the overflow menu.
void RunMenu(views::Widget* widget);
@@ -81,34 +79,34 @@ class ChevronMenuButton::MenuController : public views::MenuDelegate {
private:
// views::MenuDelegate:
- virtual bool IsCommandEnabled(int id) const override;
- virtual void ExecuteCommand(int id) override;
- virtual bool ShowContextMenu(views::MenuItemView* source,
- int id,
- const gfx::Point& p,
- ui::MenuSourceType source_type) override;
- virtual void DropMenuClosed(views::MenuItemView* menu) override;
+ bool IsCommandEnabled(int id) const override;
+ void ExecuteCommand(int id) override;
+ bool ShowContextMenu(views::MenuItemView* source,
+ int id,
+ const gfx::Point& p,
+ ui::MenuSourceType source_type) override;
+ void DropMenuClosed(views::MenuItemView* menu) override;
// These drag functions offer support for dragging icons into the overflow
// menu.
- virtual bool GetDropFormats(
+ bool GetDropFormats(
views::MenuItemView* menu,
int* formats,
std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override;
- virtual bool AreDropTypesRequired(views::MenuItemView* menu) override;
- virtual bool CanDrop(views::MenuItemView* menu,
- const ui::OSExchangeData& data) override;
- virtual int GetDropOperation(views::MenuItemView* item,
- const ui::DropTargetEvent& event,
- DropPosition* position) override;
- virtual int OnPerformDrop(views::MenuItemView* menu,
- DropPosition position,
- const ui::DropTargetEvent& event) override;
+ bool AreDropTypesRequired(views::MenuItemView* menu) override;
+ bool CanDrop(views::MenuItemView* menu,
+ const ui::OSExchangeData& data) override;
+ int GetDropOperation(views::MenuItemView* item,
+ const ui::DropTargetEvent& event,
+ DropPosition* position) override;
+ int OnPerformDrop(views::MenuItemView* menu,
+ DropPosition position,
+ const ui::DropTargetEvent& event) override;
// These three drag functions offer support for dragging icons out of the
// overflow menu.
- virtual bool CanDrag(views::MenuItemView* menu) override;
- virtual void WriteDragData(views::MenuItemView* sender,
- ui::OSExchangeData* data) override;
- virtual int GetDragOperations(views::MenuItemView* sender) override;
+ bool CanDrag(views::MenuItemView* menu) override;
+ void WriteDragData(views::MenuItemView* sender,
+ ui::OSExchangeData* data) override;
+ int GetDragOperations(views::MenuItemView* sender) override;
// Returns the offset into |views_| for the given |id|.
size_t IndexForId(int id) const;

Powered by Google App Engine
This is Rietveld 408576698