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

Unified Diff: ui/views/controls/menu/menu_runner_unittest.cc

Issue 2611773002: Removes code using mus client lib (Closed)
Patch Set: dont run on linux Created 3 years, 12 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
Index: ui/views/controls/menu/menu_runner_unittest.cc
diff --git a/ui/views/controls/menu/menu_runner_unittest.cc b/ui/views/controls/menu/menu_runner_unittest.cc
index 689f86ff18e0d424931cde2f2433efaedc41c578..3551e11e9ef58d2246bb5b8c4f2ca53ee673afa0 100644
--- a/ui/views/controls/menu/menu_runner_unittest.cc
+++ b/ui/views/controls/menu/menu_runner_unittest.cc
@@ -108,7 +108,7 @@ TEST_F(MenuRunnerTest, AsynchronousRun) {
TEST_F(MenuRunnerTest, AsynchronousKeyEventHandling) {
// TODO: test uses GetContext(), which is not applicable to aura-mus.
// http://crbug.com/663809.
- if (IsAuraMusClient())
+ if (IsMus())
return;
InitMenuRunner(MenuRunner::ASYNC);
@@ -132,7 +132,7 @@ TEST_F(MenuRunnerTest, AsynchronousKeyEventHandling) {
TEST_F(MenuRunnerTest, LatinMnemonic) {
// TODO: test uses GetContext(), which is not applicable to aura-mus.
// http://crbug.com/663809.
- if (IsAuraMusClient())
+ if (IsMus())
return;
InitMenuRunner(MenuRunner::ASYNC);
@@ -157,7 +157,7 @@ TEST_F(MenuRunnerTest, LatinMnemonic) {
TEST_F(MenuRunnerTest, NonLatinMnemonic) {
// TODO: test uses GetContext(), which is not applicable to aura-mus.
// http://crbug.com/663809.
- if (IsAuraMusClient())
+ if (IsMus())
return;
InitMenuRunner(MenuRunner::ASYNC);
@@ -242,7 +242,7 @@ class MenuRunnerWidgetTest : public MenuRunnerTest {
std::unique_ptr<ui::test::EventGenerator> EventGeneratorForWidget(
Widget* widget) {
return base::MakeUnique<ui::test::EventGenerator>(
- IsMus() || IsAuraMusClient() ? widget->GetNativeWindow() : GetContext(),
+ IsMus() ? widget->GetNativeWindow() : GetContext(),
widget->GetNativeWindow());
}
« no previous file with comments | « ui/views/controls/menu/menu_controller_unittest.cc ('k') | ui/views/controls/native/native_view_host_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698