Commit a42faacc authored by pkotwicz@chromium.org's avatar pkotwicz@chromium.org

Enable WidgetCaptureTest.CaptureDesktopNativeWidget on desktop Linux

BUG=163931
TEST=None
TBR=erg

Review URL: https://codereview.chromium.org/374533002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282556 0039d316-1c4b-4281-b951-d872f2087c98
parent 5456e86f
...@@ -882,7 +882,7 @@ TEST_F(WidgetCaptureTest, Capture) { ...@@ -882,7 +882,7 @@ TEST_F(WidgetCaptureTest, Capture) {
TestCapture(false); TestCapture(false);
} }
#if !defined(OS_LINUX) #if !defined(OS_CHROMEOS)
// See description in TestCapture(). Creates DesktopNativeWidget. // See description in TestCapture(). Creates DesktopNativeWidget.
TEST_F(WidgetCaptureTest, CaptureDesktopNativeWidget) { TEST_F(WidgetCaptureTest, CaptureDesktopNativeWidget) {
TestCapture(true); TestCapture(true);
...@@ -930,10 +930,10 @@ TEST_F(WidgetCaptureTest, MouseExitOnCaptureGrab) { ...@@ -930,10 +930,10 @@ TEST_F(WidgetCaptureTest, MouseExitOnCaptureGrab) {
} }
#endif #endif
#if !defined(OS_CHROMEOS) #if defined(OS_WIN)
namespace { namespace {
// Used to veirfy OnMouseEvent() has been invoked. // Used to verify OnMouseEvent() has been invoked.
class MouseEventTrackingWidget : public Widget { class MouseEventTrackingWidget : public Widget {
public: public:
MouseEventTrackingWidget() : got_mouse_event_(false) {} MouseEventTrackingWidget() : got_mouse_event_(false) {}
...@@ -959,18 +959,10 @@ class MouseEventTrackingWidget : public Widget { ...@@ -959,18 +959,10 @@ class MouseEventTrackingWidget : public Widget {
} // namespace } // namespace
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
// TODO(erg): linux_aura bringup: http://crbug.com/163931
#define MAYBE_MouseEventDispatchedToRightWindow \
DISABLED_MouseEventDispatchedToRightWindow
#else
#define MAYBE_MouseEventDispatchedToRightWindow \
MouseEventDispatchedToRightWindow
#endif
// Verifies if a mouse event is received on a widget that doesn't have capture // Verifies if a mouse event is received on a widget that doesn't have capture
// it is correctly processed by the widget that doesn't have capture. // on Windows that it is correctly processed by the widget that doesn't have
TEST_F(WidgetCaptureTest, MAYBE_MouseEventDispatchedToRightWindow) { // capture. This behavior is not desired on OSes other than Windows.
TEST_F(WidgetCaptureTest, MouseEventDispatchedToRightWindow) {
MouseEventTrackingWidget widget1; MouseEventTrackingWidget widget1;
Widget::InitParams params1 = Widget::InitParams params1 =
CreateParams(views::Widget::InitParams::TYPE_WINDOW); CreateParams(views::Widget::InitParams::TYPE_WINDOW);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment