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

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

Issue 374533002: Enable WidgetCaptureTest.CaptureDesktopNativeWidget on desktop Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_interactive_uitest.cc
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index c7f9a4a19d0365fe5102207b604cabcb24d1fad1..148f811741388d08426ccda87dd005dd9851b961 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -882,7 +882,7 @@ TEST_F(WidgetCaptureTest, Capture) {
TestCapture(false);
}
-#if !defined(OS_LINUX)
+#if !defined(OS_CHROMEOS)
// See description in TestCapture(). Creates DesktopNativeWidget.
TEST_F(WidgetCaptureTest, CaptureDesktopNativeWidget) {
TestCapture(true);
@@ -930,10 +930,10 @@ TEST_F(WidgetCaptureTest, MouseExitOnCaptureGrab) {
}
#endif
-#if !defined(OS_CHROMEOS)
+#if defined(OS_WIN)
namespace {
-// Used to veirfy OnMouseEvent() has been invoked.
+// Used to verify OnMouseEvent() has been invoked.
class MouseEventTrackingWidget : public Widget {
public:
MouseEventTrackingWidget() : got_mouse_event_(false) {}
@@ -959,18 +959,10 @@ class MouseEventTrackingWidget : public Widget {
} // 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
-// it is correctly processed by the widget that doesn't have capture.
-TEST_F(WidgetCaptureTest, MAYBE_MouseEventDispatchedToRightWindow) {
+// on Windows that it is correctly processed by the widget that doesn't have
+// capture. This behavior is not desired on OSes other than Windows.
pkotwicz 2014/07/10 19:22:28 We do not want this behavior on Desktop Linux. Not
+TEST_F(WidgetCaptureTest, MouseEventDispatchedToRightWindow) {
MouseEventTrackingWidget widget1;
Widget::InitParams params1 =
CreateParams(views::Widget::InitParams::TYPE_WINDOW);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698