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

Side by Side Diff: chrome/browser/ui/views/menu_controller_interactive_uitest.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
« no previous file with comments | « chrome/browser/ui/views/login_view.h ('k') | chrome/browser/ui/views/menu_controller_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 MenuControllerMnemonicTestNoMatch; 82 MenuControllerMnemonicTestNoMatch;
83 83
84 #if defined(USE_OZONE) 84 #if defined(USE_OZONE)
85 // ozone bringup - http://crbug.com/401304 85 // ozone bringup - http://crbug.com/401304
86 #define MAYBE_NoMatch DISABLED_NoMatch 86 #define MAYBE_NoMatch DISABLED_NoMatch
87 #else 87 #else
88 #define MAYBE_NoMatch NoMatch 88 #define MAYBE_NoMatch NoMatch
89 #endif 89 #endif
90 90
91 VIEW_TEST(MenuControllerMnemonicTestNoMatch, MAYBE_NoMatch); 91 VIEW_TEST(MenuControllerMnemonicTestNoMatch, MAYBE_NoMatch);
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/login_view.h ('k') | chrome/browser/ui/views/menu_controller_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698