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

Unified Diff: chrome/browser/ui/views/toolbar/wrench_menu.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/wrench_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.cc b/chrome/browser/ui/views/toolbar/wrench_menu.cc
index acb8976b8e64e60f441277a2c812d55c50163f3d..8c1d8d2293b09547f4c399938418e10cb12e6610 100644
--- a/chrome/browser/ui/views/toolbar/wrench_menu.cc
+++ b/chrome/browser/ui/views/toolbar/wrench_menu.cc
@@ -106,7 +106,7 @@ class FullscreenButton : public ImageButton {
: ImageButton(listener) { }
// Overridden from ImageButton.
- virtual gfx::Size GetPreferredSize() const override {
+ gfx::Size GetPreferredSize() const override {
gfx::Size pref = ImageButton::GetPreferredSize();
if (border()) {
gfx::Insets insets = border()->GetInsets();
@@ -148,7 +148,7 @@ class InMenuButtonBackground : public views::Background {
}
// Overridden from views::Background.
- virtual void Paint(gfx::Canvas* canvas, View* view) const override {
+ void Paint(gfx::Canvas* canvas, View* view) const override {
CustomButton* button = CustomButton::AsCustomButton(view);
views::Button::ButtonState state =
button ? button->state() : views::Button::STATE_NORMAL;
@@ -258,7 +258,7 @@ class InMenuButton : public LabelButton {
public:
InMenuButton(views::ButtonListener* listener, const base::string16& text)
: LabelButton(listener, text), in_menu_background_(NULL) {}
- virtual ~InMenuButton() {}
+ ~InMenuButton() override {}
void Init(InMenuButtonBackground::ButtonType type) {
SetFocusable(true);
@@ -276,7 +276,7 @@ class InMenuButton : public LabelButton {
}
// views::LabelButton
- virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
+ void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
const MenuConfig& menu_config = MenuConfig::instance(theme);
SetBorder(views::Border::CreateEmptyBorder(
0, kHorizontalPadding, 0, kHorizontalPadding));
@@ -319,13 +319,13 @@ class WrenchMenuView : public views::View,
menu_->AddObserver(this);
}
- virtual ~WrenchMenuView() {
+ ~WrenchMenuView() override {
if (menu_)
menu_->RemoveObserver(this);
}
// Overridden from views::View.
- virtual void SchedulePaintInRect(const gfx::Rect& r) override {
+ void SchedulePaintInRect(const gfx::Rect& r) override {
// Normally when the mouse enters/exits a button the buttons invokes
// SchedulePaint. As part of the button border (InMenuButtonBackground) is
// rendered by the button to the left/right of it SchedulePaint on the the
@@ -364,7 +364,7 @@ class WrenchMenuView : public views::View,
}
// Overridden from WrenchMenuObserver:
- virtual void WrenchMenuDestroyed() override {
+ void WrenchMenuDestroyed() override {
menu_->RemoveObserver(this);
menu_ = NULL;
menu_model_ = NULL;
@@ -393,9 +393,9 @@ class HoveredImageSource : public gfx::ImageSkiaSource {
: image_(image),
color_(color) {
}
- virtual ~HoveredImageSource() {}
+ ~HoveredImageSource() override {}
- virtual gfx::ImageSkiaRep GetImageForScale(float scale) override {
+ gfx::ImageSkiaRep GetImageForScale(float scale) override {
const gfx::ImageSkiaRep& rep = image_.GetRepresentation(scale);
SkBitmap bitmap = rep.sk_bitmap();
SkBitmap white;
@@ -444,13 +444,13 @@ class WrenchMenu::CutCopyPasteView : public WrenchMenuView {
}
// Overridden from View.
- virtual gfx::Size GetPreferredSize() const override {
+ gfx::Size GetPreferredSize() const override {
// Returned height doesn't matter as MenuItemView forces everything to the
// height of the menuitemview.
return gfx::Size(GetMaxChildViewPreferredWidth() * child_count(), 0);
}
- virtual void Layout() override {
+ void Layout() override {
// All buttons are given the same width.
int width = GetMaxChildViewPreferredWidth();
for (int i = 0; i < child_count(); ++i)
@@ -458,8 +458,7 @@ class WrenchMenu::CutCopyPasteView : public WrenchMenuView {
}
// Overridden from ButtonListener.
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) override {
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override {
menu()->CancelAndEvaluate(menu_model(), sender->tag());
}
@@ -553,10 +552,10 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
UpdateZoomControls();
}
- virtual ~ZoomView() {}
+ ~ZoomView() override {}
// Overridden from View.
- virtual gfx::Size GetPreferredSize() const override {
+ gfx::Size GetPreferredSize() const override {
// The increment/decrement button are forced to the same width.
int button_width = std::max(increment_button_->GetPreferredSize().width(),
decrement_button_->GetPreferredSize().width());
@@ -569,7 +568,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
fullscreen_width, 0);
}
- virtual void Layout() override {
+ void Layout() override {
int x = 0;
int button_width = std::max(increment_button_->GetPreferredSize().width(),
decrement_button_->GetPreferredSize().width());
@@ -594,7 +593,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
fullscreen_button_->SetBoundsRect(bounds);
}
- virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
+ void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
WrenchMenuView::OnNativeThemeChanged(theme);
const MenuConfig& menu_config = MenuConfig::instance(theme);
@@ -622,8 +621,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
}
// Overridden from ButtonListener.
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) override {
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override {
if (sender->tag() == fullscreen_index_) {
menu()->CancelAndEvaluate(menu_model(), sender->tag());
} else {
@@ -633,9 +631,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
}
// Overridden from WrenchMenuObserver.
- virtual void WrenchMenuDestroyed() override {
- WrenchMenuView::WrenchMenuDestroyed();
- }
+ void WrenchMenuDestroyed() override { WrenchMenuView::WrenchMenuDestroyed(); }
private:
void OnZoomLevelChanged(const HostZoomMap::ZoomLevelChange& change) {
@@ -723,7 +719,7 @@ class WrenchMenu::RecentTabsMenuModelDelegate : public ui::MenuModelDelegate {
model_->SetMenuModelDelegate(this);
}
- virtual ~RecentTabsMenuModelDelegate() {
+ ~RecentTabsMenuModelDelegate() override {
model_->SetMenuModelDelegate(NULL);
}
@@ -739,7 +735,7 @@ class WrenchMenu::RecentTabsMenuModelDelegate : public ui::MenuModelDelegate {
// ui::MenuModelDelegate implementation:
- virtual void OnIconChanged(int index) override {
+ void OnIconChanged(int index) override {
int command_id = model_->GetCommandIdAt(index);
views::MenuItemView* item = menu_item_->GetMenuItemByID(command_id);
DCHECK(item);
@@ -748,7 +744,7 @@ class WrenchMenu::RecentTabsMenuModelDelegate : public ui::MenuModelDelegate {
item->SetIcon(*icon.ToImageSkia());
}
- virtual void OnMenuStructureChanged() override {
+ void OnMenuStructureChanged() override {
if (menu_item_->HasSubmenu()) {
// Remove all menu items from submenu.
views::SubmenuView* submenu = menu_item_->GetSubmenu();
« no previous file with comments | « chrome/browser/ui/views/toolbar/wrench_menu.h ('k') | chrome/browser/ui/views/toolbar/wrench_toolbar_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698