| 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 "build/build_config.h" |
| 7 #include "ui/views/widget/native_widget_aura.h" | 8 #include "ui/views/widget/native_widget_aura.h" |
| 8 | 9 |
| 9 #if !defined(OS_CHROMEOS) | 10 #if !defined(OS_CHROMEOS) |
| 10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 11 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 11 #endif | 12 #endif |
| 12 | 13 |
| 13 namespace views { | 14 namespace views { |
| 14 | 15 |
| 15 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} | 16 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} |
| 16 | 17 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 29 params->type != views::Widget::InitParams::TYPE_MENU && | 30 params->type != views::Widget::InitParams::TYPE_MENU && |
| 30 params->type != views::Widget::InitParams::TYPE_TOOLTIP) { | 31 params->type != views::Widget::InitParams::TYPE_TOOLTIP) { |
| 31 params->native_widget = new views::NativeWidgetAura(delegate); | 32 params->native_widget = new views::NativeWidgetAura(delegate); |
| 32 } else { | 33 } else { |
| 33 params->native_widget = new views::DesktopNativeWidgetAura(delegate); | 34 params->native_widget = new views::DesktopNativeWidgetAura(delegate); |
| 34 } | 35 } |
| 35 #endif | 36 #endif |
| 36 } | 37 } |
| 37 | 38 |
| 38 } // namespace views | 39 } // namespace views |
| OLD | NEW |