| OLD | NEW |
| 1 // Copyright 2016 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 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_ | 5 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_ |
| 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ | 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "ui/aura/mus/window_tree_client_delegate.h" | 11 #include "ui/aura/mus/window_tree_client_delegate.h" |
| 12 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" | 12 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" |
| 13 #include "ui/views/mus/mus_export.h" | 13 #include "ui/views/mus/mus_export.h" |
| 14 #include "ui/views/mus/screen_mus_delegate.h" | 14 #include "ui/views/mus/screen_mus_delegate.h" |
| 15 #include "ui/views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
| 16 | 16 |
| 17 namespace aura { | 17 namespace aura { |
| 18 class GpuService; | |
| 19 class PropertyConverter; | 18 class PropertyConverter; |
| 20 class MusContextFactory; | 19 class MusContextFactory; |
| 21 class Window; | 20 class Window; |
| 22 class WindowTreeClient; | 21 class WindowTreeClient; |
| 23 } | 22 } |
| 24 | 23 |
| 25 namespace base { | 24 namespace base { |
| 26 class SingleThreadTaskRunner; | 25 class SingleThreadTaskRunner; |
| 27 } | 26 } |
| 28 | 27 |
| 29 namespace service_manager { | 28 namespace service_manager { |
| 30 class Connector; | 29 class Connector; |
| 31 class Identity; | 30 class Identity; |
| 32 } | 31 } |
| 33 | 32 |
| 33 namespace ui { |
| 34 class GpuService; |
| 35 } |
| 36 |
| 34 namespace wm { | 37 namespace wm { |
| 35 class WMState; | 38 class WMState; |
| 36 } | 39 } |
| 37 | 40 |
| 38 namespace views { | 41 namespace views { |
| 39 | 42 |
| 40 class ScreenMus; | 43 class ScreenMus; |
| 41 | 44 |
| 42 namespace internal { | 45 namespace internal { |
| 43 class NativeWidgetDelegate; | 46 class NativeWidgetDelegate; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 service_manager::Identity identity_; | 115 service_manager::Identity identity_; |
| 113 | 116 |
| 114 std::unique_ptr<wm::WMState> wm_state_; | 117 std::unique_ptr<wm::WMState> wm_state_; |
| 115 | 118 |
| 116 std::unique_ptr<ScreenMus> screen_; | 119 std::unique_ptr<ScreenMus> screen_; |
| 117 | 120 |
| 118 std::unique_ptr<aura::PropertyConverter> property_converter_; | 121 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 119 | 122 |
| 120 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 123 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 121 | 124 |
| 122 std::unique_ptr<aura::GpuService> gpu_service_; | 125 std::unique_ptr<ui::GpuService> gpu_service_; |
| 123 | 126 |
| 124 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; | 127 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; |
| 125 | 128 |
| 126 DISALLOW_COPY_AND_ASSIGN(MusClient); | 129 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 127 }; | 130 }; |
| 128 | 131 |
| 129 } // namespace views | 132 } // namespace views |
| 130 | 133 |
| 131 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ | 134 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ |
| OLD | NEW |