| OLD | NEW |
| 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/macros.h" |
| 5 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 6 #include "chrome/browser/ui/views/menu_test_base.h" | 7 #include "chrome/browser/ui/views/menu_test_base.h" |
| 7 #include "ui/views/controls/menu/menu_item_view.h" | 8 #include "ui/views/controls/menu/menu_item_view.h" |
| 8 #include "ui/views/controls/menu/submenu_view.h" | 9 #include "ui/views/controls/menu/submenu_view.h" |
| 9 | 10 |
| 10 template<ui::KeyboardCode KEYCODE, int EXPECTED_COMMAND> | 11 template<ui::KeyboardCode KEYCODE, int EXPECTED_COMMAND> |
| 11 class MenuControllerMnemonicTest : public MenuTestBase { | 12 class MenuControllerMnemonicTest : public MenuTestBase { |
| 12 public: | 13 public: |
| 13 MenuControllerMnemonicTest() { | 14 MenuControllerMnemonicTest() { |
| 14 } | 15 } |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 86 |
| 86 #if defined(USE_OZONE) | 87 #if defined(USE_OZONE) |
| 87 // ozone bringup - http://crbug.com/401304 | 88 // ozone bringup - http://crbug.com/401304 |
| 88 #define MAYBE_NoMatch DISABLED_NoMatch | 89 #define MAYBE_NoMatch DISABLED_NoMatch |
| 89 #else | 90 #else |
| 90 // If this flakes, disable and log details in http://crbug.com/523255. | 91 // If this flakes, disable and log details in http://crbug.com/523255. |
| 91 #define MAYBE_NoMatch NoMatch | 92 #define MAYBE_NoMatch NoMatch |
| 92 #endif | 93 #endif |
| 93 | 94 |
| 94 VIEW_TEST(MenuControllerMnemonicTestNoMatch, MAYBE_NoMatch); | 95 VIEW_TEST(MenuControllerMnemonicTestNoMatch, MAYBE_NoMatch); |
| OLD | NEW |