OLD | NEW |
1 // Copyright (c) 2012 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_mac.h" |
8 | |
9 #if !defined(OS_CHROMEOS) | |
10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | |
11 #endif | |
12 | 8 |
13 namespace views { | 9 namespace views { |
14 | 10 |
15 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} | 11 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} |
16 | 12 |
17 DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {} | 13 DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {} |
18 | 14 |
19 void DesktopTestViewsDelegate::OnBeforeWidgetInit( | 15 void DesktopTestViewsDelegate::OnBeforeWidgetInit( |
20 Widget::InitParams* params, | 16 Widget::InitParams* params, |
21 internal::NativeWidgetDelegate* delegate) { | 17 internal::NativeWidgetDelegate* delegate) { |
22 #if !defined(OS_CHROMEOS) | |
23 // If we already have a native_widget, we don't have to try to come | 18 // If we already have a native_widget, we don't have to try to come |
24 // up with one. | 19 // up with one. |
25 if (params->native_widget) | 20 if (params->native_widget) |
26 return; | 21 return; |
27 | 22 |
28 if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { | 23 if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { |
29 params->native_widget = new views::NativeWidgetAura(delegate); | 24 params->native_widget = new NativeWidgetMac(delegate); |
30 } else if (!params->parent && !params->context) { | 25 } else if (!params->parent && !params->context) { |
31 params->native_widget = new views::DesktopNativeWidgetAura(delegate); | 26 NOTIMPLEMENTED(); |
| 27 // TODO(tapted): Implement DesktopNativeWidgetAura. |
| 28 params->native_widget = new NativeWidgetMac(delegate); |
32 } | 29 } |
33 #endif | |
34 } | 30 } |
35 | 31 |
36 } // namespace views | 32 } // namespace views |
OLD | NEW |