Index: ui/views/test/desktop_test_views_delegate.cc |
diff --git a/ui/views/test/desktop_test_views_delegate.cc b/ui/views/test/desktop_test_views_delegate.cc |
index fedcb79d11be346237b1daae5205762e16b1b191..bb10cc475a9d70db10c3ce9fb633e5a5a6b0a1fb 100644 |
--- a/ui/views/test/desktop_test_views_delegate.cc |
+++ b/ui/views/test/desktop_test_views_delegate.cc |
@@ -13,20 +13,16 @@ DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} |
DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {} |
-NativeWidget* DesktopTestViewsDelegate::CreateNativeWidget( |
- Widget::InitParams::Type type, |
- internal::NativeWidgetDelegate* delegate, |
- gfx::NativeView parent, |
- gfx::NativeView context) { |
+void DesktopTestViewsDelegate::OnBeforeWidgetInit( |
+ Widget::InitParams* params, |
+ internal::NativeWidgetDelegate* delegate) { |
#if defined(USE_AURA) && !defined(OS_CHROMEOS) |
- if (parent && type != views::Widget::InitParams::TYPE_MENU) |
- return new views::NativeWidgetAura(delegate); |
- |
- if (!parent && !context) |
- return new views::DesktopNativeWidgetAura(delegate); |
+ if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { |
+ params->native_widget = new views::NativeWidgetAura(delegate); |
+ } else if (!params->parent && !params->context) { |
+ params->native_widget = new views::DesktopNativeWidgetAura(delegate); |
+ } |
#endif |
- |
- return NULL; |
} |
} // namespace views |