| Index: ui/views/widget/desktop_widget_unittest.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_screen_position_client_unittest.cc b/ui/views/widget/desktop_widget_unittest.cc
|
| similarity index 92%
|
| rename from ui/views/widget/desktop_aura/desktop_screen_position_client_unittest.cc
|
| rename to ui/views/widget/desktop_widget_unittest.cc
|
| index ac30d1ee700dc0d6dff326bd00e27575c254cefa..6bd67c6ee4af56160e99eb4384240e18ddaa27d0 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_screen_position_client_unittest.cc
|
| +++ b/ui/views/widget/desktop_widget_unittest.cc
|
| @@ -3,7 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "ui/views/test/views_test_base.h"
|
| -#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
|
| +#include "ui/views/test/widget_test.h"
|
| #include "ui/views/widget/widget.h"
|
| #include "ui/views/window/dialog_delegate.h"
|
|
|
| @@ -12,13 +12,13 @@ namespace views {
|
| typedef ViewsTestBase DesktopScreenPositionClientTest;
|
|
|
| // Verifies setting the bounds of a dialog parented to a Widget with a
|
| -// DesktopNativeWidgetAura is positioned correctly.
|
| +// PlatformDesktopNativeWidget is positioned correctly.
|
| TEST_F(DesktopScreenPositionClientTest, PositionDialog) {
|
| Widget parent_widget;
|
| Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
|
| params.bounds = gfx::Rect(10, 11, 200, 200);
|
| params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
|
| - params.native_widget = new DesktopNativeWidgetAura(&parent_widget);
|
| + params.native_widget = new PlatformDesktopNativeWidget(&parent_widget);
|
| parent_widget.Init(params);
|
|
|
| // Owned by |dialog|.
|
| @@ -52,7 +52,7 @@ TEST_F(DesktopScreenPositionClientTest, PositionControlWithNonRootParent) {
|
| CreateParams(Widget::InitParams::TYPE_WINDOW);
|
| params1.bounds = gfx::Rect(origin, gfx::Size(700, 600));
|
| params1.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
|
| - params1.native_widget = new DesktopNativeWidgetAura(&widget1);
|
| + params1.native_widget = new PlatformDesktopNativeWidget(&widget1);
|
| widget1.Init(params1);
|
|
|
| Widget::InitParams params2 =
|
|
|