| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/aura/window_tree_host.h" | 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" |
| 6 |
| 6 #include "ui/native_theme/native_theme_aura.h" | 7 #include "ui/native_theme/native_theme_aura.h" |
| 7 #include "ui/views/widget/desktop_aura/desktop_factory_ozone.h" | |
| 8 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" | |
| 9 | 8 |
| 10 namespace views { | 9 namespace views { |
| 11 | 10 |
| 11 // static |
| 12 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( | 12 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( |
| 13 internal::NativeWidgetDelegate* native_widget_delegate, | 13 internal::NativeWidgetDelegate* native_widget_delegate, |
| 14 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 14 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
| 15 DesktopFactoryOzone* d_factory = DesktopFactoryOzone::GetInstance(); | 15 // DesktopNativeWidgetAura is only used with mus, and MusClient injects the |
| 16 | 16 // DesktopWindowTreeHost so that this is never called. |
| 17 return d_factory->CreateWindowTreeHost(native_widget_delegate, | 17 NOTREACHED(); |
| 18 desktop_native_widget_aura); | 18 return nullptr; |
| 19 } | 19 } |
| 20 | 20 |
| 21 // static | 21 // static |
| 22 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { | 22 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { |
| 23 return ui::NativeThemeAura::instance(); | 23 return ui::NativeThemeAura::instance(); |
| 24 } | 24 } |
| 25 | 25 |
| 26 } // namespace views | 26 } // namespace views |
| OLD | NEW |