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

Unified Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 682763002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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/tabs/browser_tab_strip_controller.cc
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 1367cf7563e2318bc7af31f3ca26a9bb88b4ce8f..5fecd4081fbd33090d8dc78aef60aff618512a80 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -101,7 +101,7 @@ class BrowserTabStripController::TabContextMenuContents
views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
}
- virtual ~TabContextMenuContents() {
+ ~TabContextMenuContents() override {
if (controller_)
controller_->tabstrip_->StopAllHighlighting();
}
@@ -122,17 +122,14 @@ class BrowserTabStripController::TabContextMenuContents
}
// Overridden from ui::SimpleMenuModel::Delegate:
- virtual bool IsCommandIdChecked(int command_id) const override {
- return false;
- }
- virtual bool IsCommandIdEnabled(int command_id) const override {
+ bool IsCommandIdChecked(int command_id) const override { return false; }
+ bool IsCommandIdEnabled(int command_id) const override {
return controller_->IsCommandEnabledForTab(
static_cast<TabStripModel::ContextMenuCommand>(command_id),
tab_);
}
- virtual bool GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) override {
+ bool GetAcceleratorForCommandId(int command_id,
+ ui::Accelerator* accelerator) override {
int browser_cmd;
return TabStripModel::ContextMenuCommandToBrowserCommand(command_id,
&browser_cmd) ?
@@ -140,12 +137,12 @@ class BrowserTabStripController::TabContextMenuContents
accelerator) :
false;
}
- virtual void CommandIdHighlighted(int command_id) override {
+ void CommandIdHighlighted(int command_id) override {
controller_->StopHighlightTabsForCommand(last_command_, tab_);
last_command_ = static_cast<TabStripModel::ContextMenuCommand>(command_id);
controller_->StartHighlightTabsForCommand(last_command_, tab_);
}
- virtual void ExecuteCommand(int command_id, int event_flags) override {
+ void ExecuteCommand(int command_id, int event_flags) override {
// Executing the command destroys |this|, and can also end up destroying
// |controller_|. So stop the highlights before executing the command.
controller_->tabstrip_->StopAllHighlighting();
@@ -154,7 +151,7 @@ class BrowserTabStripController::TabContextMenuContents
tab_);
}
- virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) override {
+ void MenuClosed(ui::SimpleMenuModel* /*source*/) override {
if (controller_)
controller_->tabstrip_->StopAllHighlighting();
}

Powered by Google App Engine
This is Rietveld 408576698