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

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

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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/tabs/tab_strip.cc ('k') | chrome/browser/ui/views/uninstall_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 24c34edf92ec9a44f1679126649cb48e1029218a..c22775a7cd1df11d797eb0600ba48deaa036dbe1 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button_test.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button_test.cc
@@ -20,56 +20,56 @@ class ToolbarButtonDragTest : public ViewEventTestBase,
menu_closed_(false) {
}
- virtual ~ToolbarButtonDragTest() {
+ ~ToolbarButtonDragTest() override {
}
// ViewEventTestBase implementation.
- virtual void SetUp() override {
+ void SetUp() override {
button_ = new ToolbarButton(NULL, new ui::SimpleMenuModel(this));
ViewEventTestBase::SetUp();
}
- virtual void TearDown() override {
+ void TearDown() override {
ViewEventTestBase::TearDown();
}
- virtual views::View* CreateContentsView() override {
+ views::View* CreateContentsView() override {
return button_;
}
- virtual gfx::Size GetPreferredSize() const override {
+ gfx::Size GetPreferredSize() const override {
return button_->GetPreferredSize();
}
// ui::SimpleMenuModel::Delegate implementation.
- virtual bool IsCommandIdChecked(int id) const override {
+ bool IsCommandIdChecked(int id) const override {
return false;
}
- virtual bool IsCommandIdEnabled(int id) const override {
+ bool IsCommandIdEnabled(int id) const override {
return true;
}
- virtual bool GetAcceleratorForCommandId(
+ bool GetAcceleratorForCommandId(
int id,
ui::Accelerator* accelerator) override {
return false;
}
- virtual void ExecuteCommand(int id, int event_flags) override {
+ void ExecuteCommand(int id, int event_flags) override {
}
- virtual void MenuWillShow(ui::SimpleMenuModel* /*source*/) override {
+ void MenuWillShow(ui::SimpleMenuModel* /*source*/) override {
menu_shown_ = true;
}
- virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) override {
+ void MenuClosed(ui::SimpleMenuModel* /*source*/) override {
menu_closed_ = true;
}
// ViewEventTestBase implementation.
- virtual void DoTestOnMessageLoop() override {
+ void DoTestOnMessageLoop() override {
// Click on the ToolbarButton.
ui_test_utils::MoveMouseToCenterAndPress(
button_,
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/views/uninstall_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698