| 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..46ea4cca9bb48e29ba02444f1ef537e53b638a2e 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)
|
| + Widget::InitParams init_params =
|
| + 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);
|
|
|