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

Side by Side Diff: chrome/browser/ui/views/menu_controller_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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "chrome/browser/ui/views/menu_test_base.h" 6 #include "chrome/browser/ui/views/menu_test_base.h"
7 #include "ui/views/controls/menu/menu_item_view.h" 7 #include "ui/views/controls/menu/menu_item_view.h"
8 #include "ui/views/controls/menu/submenu_view.h" 8 #include "ui/views/controls/menu/submenu_view.h"
9 9
10 template<ui::KeyboardCode KEYCODE, int EXPECTED_COMMAND> 10 template<ui::KeyboardCode KEYCODE, int EXPECTED_COMMAND>
11 class MenuControllerMnemonicTest : public MenuTestBase { 11 class MenuControllerMnemonicTest : public MenuTestBase {
12 public: 12 public:
13 MenuControllerMnemonicTest() { 13 MenuControllerMnemonicTest() {
14 } 14 }
15 15
16 virtual ~MenuControllerMnemonicTest() { 16 virtual ~MenuControllerMnemonicTest() {
17 } 17 }
18 18
19 // MenuTestBase overrides: 19 // MenuTestBase overrides:
20 virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE { 20 virtual void BuildMenu(views::MenuItemView* menu) override {
21 ASSERT_NE(ui::VKEY_DIVIDE, '/'); 21 ASSERT_NE(ui::VKEY_DIVIDE, '/');
22 menu->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One&/")); 22 menu->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One&/"));
23 menu->AppendMenuItemWithLabel(2, base::ASCIIToUTF16("Two")); 23 menu->AppendMenuItemWithLabel(2, base::ASCIIToUTF16("Two"));
24 } 24 }
25 25
26 virtual void DoTestWithMenuOpen() { 26 virtual void DoTestWithMenuOpen() {
27 ASSERT_TRUE(menu()->GetSubmenu()->IsShowing()); 27 ASSERT_TRUE(menu()->GetSubmenu()->IsShowing());
28 KeyPress(KEYCODE, 28 KeyPress(KEYCODE,
29 CreateEventTask(this, &MenuControllerMnemonicTest::Step2)); 29 CreateEventTask(this, &MenuControllerMnemonicTest::Step2));
30 } 30 }
(...skipping 27 matching lines...) Expand all
58 // Pressing a key which matches the first letter of the menu item's title 58 // Pressing a key which matches the first letter of the menu item's title
59 // should execute the command for that menu item. 59 // should execute the command for that menu item.
60 typedef MenuControllerMnemonicTest<ui::VKEY_T, 2> 60 typedef MenuControllerMnemonicTest<ui::VKEY_T, 2>
61 MenuControllerMnemonicTestTitleMatch; 61 MenuControllerMnemonicTestTitleMatch;
62 VIEW_TEST(MenuControllerMnemonicTestTitleMatch, TitleMatch); 62 VIEW_TEST(MenuControllerMnemonicTestTitleMatch, TitleMatch);
63 63
64 // Pressing an arbitrary key should not execute any commands. 64 // Pressing an arbitrary key should not execute any commands.
65 typedef MenuControllerMnemonicTest<ui::VKEY_A, 0> 65 typedef MenuControllerMnemonicTest<ui::VKEY_A, 0>
66 MenuControllerMnemonicTestNoMatch; 66 MenuControllerMnemonicTestNoMatch;
67 VIEW_TEST(MenuControllerMnemonicTestNoMatch, NoMatch); 67 VIEW_TEST(MenuControllerMnemonicTestNoMatch, NoMatch);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698