diff options
Diffstat (limited to 'chrome/browser/ui/views/menu_item_view_interactive_uitest.cc')
-rw-r--r-- | chrome/browser/ui/views/menu_item_view_interactive_uitest.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc index 00160be..c28a9a0d 100644 --- a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc @@ -18,11 +18,11 @@ class MenuItemViewTestBasic : public MenuTestBase { MenuItemViewTestBasic() { } - virtual ~MenuItemViewTestBasic() { + ~MenuItemViewTestBasic() override { } // MenuTestBase implementation - virtual void BuildMenu(views::MenuItemView* menu) override { + void BuildMenu(views::MenuItemView* menu) override { menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1")); menu->AppendMenuItemWithLabel(2, ASCIIToUTF16("item 2")); menu->AppendSeparator(); @@ -30,7 +30,7 @@ class MenuItemViewTestBasic : public MenuTestBase { } // Click on item INDEX. - virtual void DoTestWithMenuOpen() override { + void DoTestWithMenuOpen() override { views::SubmenuView* submenu = menu()->GetSubmenu(); ASSERT_TRUE(submenu); ASSERT_TRUE(submenu->IsShowing()); @@ -68,17 +68,17 @@ class MenuItemViewTestInsert : public MenuTestBase { MenuItemViewTestInsert() : inserted_item_(NULL) { } - virtual ~MenuItemViewTestInsert() { + ~MenuItemViewTestInsert() override { } // MenuTestBase implementation - virtual void BuildMenu(views::MenuItemView* menu) override { + void BuildMenu(views::MenuItemView* menu) override { menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1")); menu->AppendMenuItemWithLabel(2, ASCIIToUTF16("item 2")); } // Insert item at INSERT_INDEX and click item at SELECT_INDEX. - virtual void DoTestWithMenuOpen() override { + void DoTestWithMenuOpen() override { views::SubmenuView* submenu = menu()->GetSubmenu(); ASSERT_TRUE(submenu); ASSERT_TRUE(submenu->IsShowing()); @@ -150,11 +150,11 @@ class MenuItemViewTestInsertWithSubmenu : public MenuTestBase { inserted_item_(NULL) { } - virtual ~MenuItemViewTestInsertWithSubmenu() { + ~MenuItemViewTestInsertWithSubmenu() override { } // MenuTestBase implementation - virtual void BuildMenu(views::MenuItemView* menu) override { + void BuildMenu(views::MenuItemView* menu) override { submenu_ = menu->AppendSubMenu(1, ASCIIToUTF16("My Submenu")); submenu_->AppendMenuItemWithLabel(101, ASCIIToUTF16("submenu item 1")); submenu_->AppendMenuItemWithLabel(101, ASCIIToUTF16("submenu item 2")); @@ -162,7 +162,7 @@ class MenuItemViewTestInsertWithSubmenu : public MenuTestBase { } // Post submenu. - virtual void DoTestWithMenuOpen() override { + void DoTestWithMenuOpen() override { Click(submenu_, CreateEventTask(this, &MenuItemViewTestInsertWithSubmenu::Step2)); } @@ -209,18 +209,18 @@ class MenuItemViewTestRemove : public MenuTestBase { MenuItemViewTestRemove() { } - virtual ~MenuItemViewTestRemove() { + ~MenuItemViewTestRemove() override { } // MenuTestBase implementation - virtual void BuildMenu(views::MenuItemView* menu) override { + void BuildMenu(views::MenuItemView* menu) override { menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1")); menu->AppendMenuItemWithLabel(2, ASCIIToUTF16("item 2")); menu->AppendMenuItemWithLabel(3, ASCIIToUTF16("item 3")); } // Remove item at REMOVE_INDEX and click item at SELECT_INDEX. - virtual void DoTestWithMenuOpen() override { + void DoTestWithMenuOpen() override { views::SubmenuView* submenu = menu()->GetSubmenu(); ASSERT_TRUE(submenu); ASSERT_TRUE(submenu->IsShowing()); @@ -275,11 +275,11 @@ class MenuItemViewTestRemoveWithSubmenu : public MenuTestBase { MenuItemViewTestRemoveWithSubmenu() : submenu_(NULL) { } - virtual ~MenuItemViewTestRemoveWithSubmenu() { + ~MenuItemViewTestRemoveWithSubmenu() override { } // MenuTestBase implementation - virtual void BuildMenu(views::MenuItemView* menu) override { + void BuildMenu(views::MenuItemView* menu) override { menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1")); submenu_ = menu->AppendSubMenu(2, ASCIIToUTF16("My Submenu")); submenu_->AppendMenuItemWithLabel(101, ASCIIToUTF16("submenu item 1")); @@ -287,7 +287,7 @@ class MenuItemViewTestRemoveWithSubmenu : public MenuTestBase { } // Post submenu. - virtual void DoTestWithMenuOpen() override { + void DoTestWithMenuOpen() override { views::SubmenuView* submenu = menu()->GetSubmenu(); ASSERT_TRUE(submenu); ASSERT_TRUE(submenu->IsShowing()); |