| Index: ui/views/widget/widget_unittest.cc
|
| diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
|
| index 8761f7f5cc83857e0164d4f81eb654e02b4c555d..4f5cceeb9c3b5b212e063ef4a02793f54b6642f7 100644
|
| --- a/ui/views/widget/widget_unittest.cc
|
| +++ b/ui/views/widget/widget_unittest.cc
|
| @@ -1744,7 +1744,14 @@ TEST_F(WidgetTest, MouseEventDispatchWhileTouchIsDown) {
|
|
|
| // Tests that when there is no active capture, that a mouse press causes capture
|
| // to be set.
|
| -TEST_F(WidgetTest, MousePressCausesCapture) {
|
| +// 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) {
|
| Widget* widget = CreateTopLevelNativeWidget();
|
| widget->Show();
|
| widget->SetSize(gfx::Size(300, 300));
|
| @@ -1807,7 +1814,16 @@ class CaptureEventConsumer : public ui::EventHandler {
|
|
|
| // Tests that if explicit capture occurs during a mouse press, that implicit
|
| // capture is not applied.
|
| -TEST_F(WidgetTest, CaptureDuringMousePressNotOverridden) {
|
| +// 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) {
|
| Widget* widget = CreateTopLevelNativeWidget();
|
| widget->Show();
|
| widget->SetSize(gfx::Size(300, 300));
|
| @@ -3143,7 +3159,13 @@ class FullscreenAwareFrame : public views::NonClientFrameView {
|
|
|
| // Tests that frame Layout is called when a widget goes fullscreen without
|
| // changing its size or title.
|
| -TEST_F(WidgetTest, FullscreenFrameLayout) {
|
| +// Fails on Mac, but only on bots. http://crbug.com/607403.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_FullscreenFrameLayout DISABLED_FullscreenFrameLayout
|
| +#else
|
| +#define MAYBE_FullscreenFrameLayout FullscreenFrameLayout
|
| +#endif
|
| +TEST_F(WidgetTest, MAYBE_FullscreenFrameLayout) {
|
| WidgetAutoclosePtr widget(CreateTopLevelPlatformWidget());
|
| FullscreenAwareFrame* frame = new FullscreenAwareFrame(widget.get());
|
| widget->non_client_view()->SetFrameView(frame); // Owns |frame|.
|
|
|