OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/views/test/desktop_test_views_delegate.h" | 5 #include "ui/views/test/desktop_test_views_delegate.h" |
6 | 6 |
7 #include "ui/views/widget/native_widget_aura.h" | 7 #include "ui/views/widget/native_widget_aura.h" |
8 | 8 |
9 #if !defined(OS_CHROMEOS) | 9 #if !defined(OS_CHROMEOS) |
10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
11 #endif | 11 #endif |
12 | 12 |
13 namespace views { | 13 namespace views { |
14 | 14 |
15 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} | 15 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} |
16 | 16 |
17 DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {} | 17 DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {} |
18 | 18 |
19 void DesktopTestViewsDelegate::OnBeforeWidgetInit( | 19 void DesktopTestViewsDelegate::OnBeforeWidgetInit( |
20 Widget::InitParams* params, | 20 Widget::InitParams* params, |
21 internal::NativeWidgetDelegate* delegate) { | 21 internal::NativeWidgetDelegate* delegate) { |
22 #if !defined(OS_CHROMEOS) | 22 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
23 // If we already have a native_widget, we don't have to try to come | 23 // If we already have a native_widget, we don't have to try to come |
24 // up with one. | 24 // up with one. |
25 if (params->native_widget) | 25 if (params->native_widget) |
26 return; | 26 return; |
27 | 27 |
28 if (params->parent && | 28 if (params->parent && |
29 params->type != views::Widget::InitParams::TYPE_MENU && | 29 params->type != views::Widget::InitParams::TYPE_MENU && |
30 params->type != views::Widget::InitParams::TYPE_TOOLTIP) { | 30 params->type != views::Widget::InitParams::TYPE_TOOLTIP) { |
31 params->native_widget = new views::NativeWidgetAura(delegate); | 31 params->native_widget = new views::NativeWidgetAura(delegate); |
32 } else { | 32 } else { |
33 params->native_widget = new views::DesktopNativeWidgetAura(delegate); | 33 params->native_widget = new views::DesktopNativeWidgetAura(delegate); |
34 } | 34 } |
35 #endif | 35 #endif |
36 } | 36 } |
37 | 37 |
38 } // namespace views | 38 } // namespace views |
OLD | NEW |