summaryrefslogtreecommitdiffstats
path: root/ui/views/test/test_views_delegate.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/views/test/test_views_delegate.cc')
-rw-r--r--ui/views/test/test_views_delegate.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index 81f46da..0d437ea 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -6,11 +6,16 @@
#include "ui/wm/core/wm_state.h"
+#if !defined(OS_CHROMEOS)
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
+#endif // !defined(OS_CHROMEOS)
+
namespace views {
TestViewsDelegate::TestViewsDelegate()
- : use_transparent_windows_(false) {
+ : use_desktop_native_widgets_(false),
+ use_transparent_windows_(false) {
DCHECK(!ViewsDelegate::views_delegate);
ViewsDelegate::views_delegate = this;
#if defined(USE_AURA)
@@ -23,10 +28,6 @@ TestViewsDelegate::~TestViewsDelegate() {
ViewsDelegate::views_delegate = NULL;
}
-void TestViewsDelegate::SetUseTransparentWindows(bool transparent) {
- use_transparent_windows_ = transparent;
-}
-
void TestViewsDelegate::OnBeforeWidgetInit(
Widget::InitParams* params,
internal::NativeWidgetDelegate* delegate) {
@@ -35,6 +36,10 @@ void TestViewsDelegate::OnBeforeWidgetInit(
Widget::InitParams::TRANSLUCENT_WINDOW :
Widget::InitParams::OPAQUE_WINDOW;
}
+#if !defined(OS_CHROMEOS)
+ if (!params->native_widget && use_desktop_native_widgets_)
+ params->native_widget = new DesktopNativeWidgetAura(delegate);
+#endif // !defined(OS_CHROMEOS)
}
} // namespace views