Index: ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc |
index 30dc551f913c58cbebb587f6aa7df8dad3635e9a..913557f3f830fa55873c8bc9e7e0a662a4fadf6b 100644 |
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc |
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc |
@@ -30,12 +30,21 @@ TEST_F(DesktopNativeWidgetAuraTest, CreateWithParentNotInRootWindow) { |
widget.Init(params); |
} |
-// Verifies that the AURA windows making up a widget instance have the correct |
+// Verifies that the Aura windows making up a widget instance have the correct |
// bounds after the widget is resized. |
TEST_F(DesktopNativeWidgetAuraTest, DesktopAuraWindowSizeTest) { |
Widget widget; |
+ |
+ // On Linux we test this with popup windows because the WM may ignore the size |
+ // suggestion for normal windows. |
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
sky
2014/05/23 20:05:21
You can remove the chromeos part here since the de
Evan Stade
2014/05/23 21:06:00
Done.
|
+ Widget::InitParams init_params = |
sky
2014/05/23 20:05:21
Should we go for popup everywhere?
Evan Stade
2014/05/23 20:08:16
I don't know enough to know what's best, so I went
|
+ CreateParams(Widget::InitParams::TYPE_POPUP); |
+#else |
Widget::InitParams init_params = |
CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
+#endif |
+ |
init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
init_params.native_widget = new DesktopNativeWidgetAura(&widget); |
widget.Init(init_params); |