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

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

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_button.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/toolbar_button_test.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button_test.cc b/chrome/browser/ui/views/toolbar/toolbar_button_test.cc
index 2fe35e067d90e8a4a85bafbab76101de880f6556..24c34edf92ec9a44f1679126649cb48e1029218a 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button_test.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button_test.cc
@@ -24,52 +24,52 @@ class ToolbarButtonDragTest : public ViewEventTestBase,
}
// ViewEventTestBase implementation.
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
button_ = new ToolbarButton(NULL, new ui::SimpleMenuModel(this));
ViewEventTestBase::SetUp();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
ViewEventTestBase::TearDown();
}
- virtual views::View* CreateContentsView() OVERRIDE {
+ virtual views::View* CreateContentsView() override {
return button_;
}
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const override {
return button_->GetPreferredSize();
}
// ui::SimpleMenuModel::Delegate implementation.
- virtual bool IsCommandIdChecked(int id) const OVERRIDE {
+ virtual bool IsCommandIdChecked(int id) const override {
return false;
}
- virtual bool IsCommandIdEnabled(int id) const OVERRIDE {
+ virtual bool IsCommandIdEnabled(int id) const override {
return true;
}
virtual bool GetAcceleratorForCommandId(
int id,
- ui::Accelerator* accelerator) OVERRIDE {
+ ui::Accelerator* accelerator) override {
return false;
}
- virtual void ExecuteCommand(int id, int event_flags) OVERRIDE {
+ virtual void ExecuteCommand(int id, int event_flags) override {
}
- virtual void MenuWillShow(ui::SimpleMenuModel* /*source*/) OVERRIDE {
+ virtual void MenuWillShow(ui::SimpleMenuModel* /*source*/) override {
menu_shown_ = true;
}
- virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) OVERRIDE {
+ virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) override {
menu_closed_ = true;
}
// ViewEventTestBase implementation.
- virtual void DoTestOnMessageLoop() OVERRIDE {
+ virtual void DoTestOnMessageLoop() override {
// Click on the ToolbarButton.
ui_test_utils::MoveMouseToCenterAndPress(
button_,
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_button.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698