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

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

Issue 1925943002: Add views_unittests to Mac10.{9,9(dbg),10,11} and asan bots (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yipe - cater for r401862 and r401987 Created 4 years, 6 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
« no previous file with comments | « ui/views/cocoa/bridged_native_widget_unittest.mm ('k') | ui/views/controls/styled_label_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6d76f7e92e2e718e7045cec79f8d6581bfb3712a..e22f746f297f682f233b86f2dd28d9a14e4f8447 100644
--- a/ui/views/controls/menu/menu_runner_unittest.cc
+++ b/ui/views/controls/menu/menu_runner_unittest.cc
@@ -217,7 +217,14 @@ class MenuLauncherEventHandler : public ui::EventHandler {
// Tests that when a mouse press launches a menu, that the target widget does
// not take explicit capture, nor closes the menu.
-TEST_F(MenuRunnerTest, WidgetDoesntTakeCapture) {
+// Disabled on Mac (GetGlobalCapture() not yet implemented).
+// http://crbug.com//622979.
+#if defined(OS_MACOSX)
+#define MAYBE_WidgetDoesntTakeCapture DISABLED_WidgetDoesntTakeCapture
+#else
+#define MAYBE_WidgetDoesntTakeCapture WidgetDoesntTakeCapture
+#endif
+TEST_F(MenuRunnerTest, MAYBE_WidgetDoesntTakeCapture) {
Widget* widget = new Widget;
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
widget->Init(params);
« no previous file with comments | « ui/views/cocoa/bridged_native_widget_unittest.mm ('k') | ui/views/controls/styled_label_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698