| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 | 27 |
| 28 if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { | 28 if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { |
| 29 params->native_widget = new views::NativeWidgetAura(delegate); | 29 params->native_widget = new views::NativeWidgetAura(delegate); |
| 30 } else if (!params->parent && !params->context) { | 30 } else if (!params->parent && !params->context) { |
| 31 params->native_widget = new views::DesktopNativeWidgetAura(delegate); | 31 params->native_widget = new views::DesktopNativeWidgetAura(delegate); |
| 32 } | 32 } |
| 33 #endif | 33 #endif |
| 34 } | 34 } |
| 35 | 35 |
| 36 } // namespace views | 36 } // namespace views |
| OLD | NEW |