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

Unified Diff: ash/shell_unittest.cc

Issue 2790773002: Cleanup MenuRunner API (Closed)
Patch Set: Rebase Created 3 years, 8 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: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 1a981617bb3f50678b05f7d30737fb55bbadbab6..f4a8488cf45ef3cbc249f5304b411bdc2c2bbbfb 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -357,14 +357,11 @@ TEST_F(ShellTest, LockScreenClosesActiveMenu) {
->GetRootWindowController()
->wallpaper_widget_controller()
->widget();
- std::unique_ptr<views::MenuRunner> menu_runner(new views::MenuRunner(
- menu_model.get(),
- views::MenuRunner::CONTEXT_MENU | views::MenuRunner::ASYNC));
-
- EXPECT_EQ(views::MenuRunner::NORMAL_EXIT,
- menu_runner->RunMenuAt(widget, NULL, gfx::Rect(),
- views::MENU_ANCHOR_TOPLEFT,
- ui::MENU_SOURCE_MOUSE));
+ std::unique_ptr<views::MenuRunner> menu_runner(
+ new views::MenuRunner(menu_model.get(), views::MenuRunner::CONTEXT_MENU));
+
+ menu_runner->RunMenuAt(widget, NULL, gfx::Rect(), views::MENU_ANCHOR_TOPLEFT,
+ ui::MENU_SOURCE_MOUSE);
LockScreenAndVerifyMenuClosed();
}
« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698