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

Unified Diff: ui/views/widget/widget_unittest.cc

Issue 2096993002: MacViews: Fix failing mouse capture unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mouse_capture_lifetime
Patch Set: Enable tests. 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/widget/native_widget_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 4da9b95c7bf46cba15fbe291db7244fe57c429d7..45ea028344667104e55aa80eee54da1c9e167e1a 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -1768,14 +1768,7 @@ TEST_F(WidgetTest, MouseEventDispatchWhileTouchIsDown) {
// Tests that when there is no active capture, that a mouse press causes capture
// to be set.
-// Disabled on Mac (GetGlobalCapture() not yet implemented).
-// http://crbug.com//622979.
-#if defined(OS_MACOSX)
-#define MAYBE_MousePressCausesCapture DISABLED_MousePressCausesCapture
-#else
-#define MAYBE_MousePressCausesCapture MousePressCausesCapture
-#endif
-TEST_F(WidgetTest, MAYBE_MousePressCausesCapture) {
+TEST_F(WidgetTest, MousePressCausesCapture) {
Widget* widget = CreateTopLevelNativeWidget();
widget->Show();
widget->SetSize(gfx::Size(300, 300));
@@ -1838,16 +1831,7 @@ class CaptureEventConsumer : public ui::EventHandler {
// Tests that if explicit capture occurs during a mouse press, that implicit
// capture is not applied.
-// Disabled on Mac (GetGlobalCapture() not yet implemented).
-// http://crbug.com//622979.
-#if defined(OS_MACOSX)
-#define MAYBE_CaptureDuringMousePressNotOverridden \
- DISABLED_CaptureDuringMousePressNotOverridden
-#else
-#define MAYBE_CaptureDuringMousePressNotOverridden \
- CaptureDuringMousePressNotOverridden
-#endif
-TEST_F(WidgetTest, MAYBE_CaptureDuringMousePressNotOverridden) {
+TEST_F(WidgetTest, CaptureDuringMousePressNotOverridden) {
Widget* widget = CreateTopLevelNativeWidget();
widget->Show();
widget->SetSize(gfx::Size(300, 300));
« no previous file with comments | « ui/views/widget/native_widget_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698