| 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" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 namespace ui { | 33 namespace ui { |
| 34 class GpuService; | 34 class GpuService; |
| 35 } | 35 } |
| 36 | 36 |
| 37 namespace wm { | 37 namespace wm { |
| 38 class WMState; | 38 class WMState; |
| 39 } | 39 } |
| 40 | 40 |
| 41 namespace views { | 41 namespace views { |
| 42 | 42 |
| 43 class PointerWatcherEventRouter2; |
| 43 class ScreenMus; | 44 class ScreenMus; |
| 44 | 45 |
| 45 namespace internal { | 46 namespace internal { |
| 46 class NativeWidgetDelegate; | 47 class NativeWidgetDelegate; |
| 47 } | 48 } |
| 48 | 49 |
| 49 namespace test { | 50 namespace test { |
| 50 class MusClientTestApi; | 51 class MusClientTestApi; |
| 51 } | 52 } |
| 52 | 53 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 69 // created. | 70 // created. |
| 70 static bool ShouldCreateDesktopNativeWidgetAura( | 71 static bool ShouldCreateDesktopNativeWidgetAura( |
| 71 const Widget::InitParams& init_params); | 72 const Widget::InitParams& init_params); |
| 72 | 73 |
| 73 service_manager::Connector* connector() { return connector_; } | 74 service_manager::Connector* connector() { return connector_; } |
| 74 | 75 |
| 75 aura::WindowTreeClient* window_tree_client() { | 76 aura::WindowTreeClient* window_tree_client() { |
| 76 return window_tree_client_.get(); | 77 return window_tree_client_.get(); |
| 77 } | 78 } |
| 78 | 79 |
| 80 PointerWatcherEventRouter2* pointer_watcher_event_router() { |
| 81 return pointer_watcher_event_router_.get(); |
| 82 } |
| 83 |
| 79 // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is | 84 // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is |
| 80 // set as the factory function used for creating NativeWidgets when a | 85 // set as the factory function used for creating NativeWidgets when a |
| 81 // NativeWidget has not been explicitly set. | 86 // NativeWidget has not been explicitly set. |
| 82 NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params, | 87 NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params, |
| 83 internal::NativeWidgetDelegate* delegate); | 88 internal::NativeWidgetDelegate* delegate); |
| 84 | 89 |
| 85 private: | 90 private: |
| 86 friend class AuraInit; | 91 friend class AuraInit; |
| 87 friend class test::MusClientTestApi; | 92 friend class test::MusClientTestApi; |
| 88 | 93 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 117 std::unique_ptr<wm::WMState> wm_state_; | 122 std::unique_ptr<wm::WMState> wm_state_; |
| 118 | 123 |
| 119 std::unique_ptr<ScreenMus> screen_; | 124 std::unique_ptr<ScreenMus> screen_; |
| 120 | 125 |
| 121 std::unique_ptr<aura::PropertyConverter> property_converter_; | 126 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 122 | 127 |
| 123 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 128 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 124 | 129 |
| 125 std::unique_ptr<ui::GpuService> gpu_service_; | 130 std::unique_ptr<ui::GpuService> gpu_service_; |
| 126 | 131 |
| 132 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_; |
| 133 |
| 127 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; | 134 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; |
| 128 | 135 |
| 129 DISALLOW_COPY_AND_ASSIGN(MusClient); | 136 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 130 }; | 137 }; |
| 131 | 138 |
| 132 } // namespace views | 139 } // namespace views |
| 133 | 140 |
| 134 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ | 141 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ |
| OLD | NEW |