| 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_INIT_H_ | 5 #ifndef UI_VIEWS_MUS_MUS_CLIENT_INIT_H_ |
| 6 #define UI_VIEWS_MUS_MUS_CLIENT_INIT_H_ | 6 #define UI_VIEWS_MUS_MUS_CLIENT_INIT_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 Env; | 18 class Env; |
| 19 class GpuService; |
| 19 class PropertyConverter; | 20 class PropertyConverter; |
| 20 class Window; | 21 class Window; |
| 21 class WindowPort; | 22 class WindowPort; |
| 22 class WindowTreeClient; | 23 class WindowTreeClient; |
| 23 } | 24 } |
| 24 | 25 |
| 25 namespace base { | 26 namespace base { |
| 26 class SingleThreadTaskRunner; | 27 class SingleThreadTaskRunner; |
| 27 } | 28 } |
| 28 | 29 |
| 29 namespace service_manager { | 30 namespace service_manager { |
| 30 class Connector; | 31 class Connector; |
| 31 class Identity; | 32 class Identity; |
| 32 } | 33 } |
| 33 | 34 |
| 34 namespace ui { | |
| 35 class GpuService; | |
| 36 } | |
| 37 | |
| 38 namespace wm { | 35 namespace wm { |
| 39 class FocusController; | 36 class FocusController; |
| 40 class WMState; | 37 class WMState; |
| 41 } | 38 } |
| 42 | 39 |
| 43 namespace views { | 40 namespace views { |
| 44 | 41 |
| 45 class AuraInit; | 42 class AuraInit; |
| 46 class ScreenMus; | 43 class ScreenMus; |
| 47 class SurfaceContextFactory; | 44 class SurfaceContextFactory; |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 std::unique_ptr<wm::WMState> wm_state_; | 99 std::unique_ptr<wm::WMState> wm_state_; |
| 103 | 100 |
| 104 std::unique_ptr<ScreenMus> screen_; | 101 std::unique_ptr<ScreenMus> screen_; |
| 105 | 102 |
| 106 std::unique_ptr<wm::FocusController> focus_controller_; | 103 std::unique_ptr<wm::FocusController> focus_controller_; |
| 107 | 104 |
| 108 std::unique_ptr<aura::PropertyConverter> property_converter_; | 105 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 109 | 106 |
| 110 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 107 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 111 | 108 |
| 112 std::unique_ptr<ui::GpuService> gpu_service_; | 109 std::unique_ptr<aura::GpuService> gpu_service_; |
| 113 | 110 |
| 114 std::unique_ptr<SurfaceContextFactory> compositor_context_factory_; | 111 std::unique_ptr<SurfaceContextFactory> compositor_context_factory_; |
| 115 | 112 |
| 116 DISALLOW_COPY_AND_ASSIGN(MusClient); | 113 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 117 }; | 114 }; |
| 118 | 115 |
| 119 } // namespace views | 116 } // namespace views |
| 120 | 117 |
| 121 #endif // UI_VIEWS_MUS_MUS_CLIENT_INIT_H_ | 118 #endif // UI_VIEWS_MUS_MUS_CLIENT_INIT_H_ |
| OLD | NEW |