OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "services/tracing/public/cpp/provider.h" | 21 #include "services/tracing/public/cpp/provider.h" |
22 #include "services/ui/common/types.h" | 22 #include "services/ui/common/types.h" |
23 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h" | 23 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h" |
24 | 24 |
25 namespace views { | 25 namespace views { |
26 class AuraInit; | 26 class AuraInit; |
27 } | 27 } |
28 | 28 |
29 namespace ui { | 29 namespace ui { |
30 class Event; | 30 class Event; |
| 31 class GpuService; |
31 class WindowTreeClient; | 32 class WindowTreeClient; |
32 } | 33 } |
33 | 34 |
34 namespace ash { | 35 namespace ash { |
35 namespace mus { | 36 namespace mus { |
36 | 37 |
37 class AcceleratorRegistrarImpl; | 38 class AcceleratorRegistrarImpl; |
38 class RootWindowController; | 39 class RootWindowController; |
39 class ShelfLayoutImpl; | 40 class ShelfLayoutImpl; |
40 class UserWindowControllerImpl; | 41 class UserWindowControllerImpl; |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 shelf_layout_requests_; | 102 shelf_layout_requests_; |
102 | 103 |
103 // |user_window_controller_| is created once OnEmbed() is called. Until that | 104 // |user_window_controller_| is created once OnEmbed() is called. Until that |
104 // time |user_window_controller_requests_| stores pending interface requests. | 105 // time |user_window_controller_requests_| stores pending interface requests. |
105 std::unique_ptr<UserWindowControllerImpl> user_window_controller_; | 106 std::unique_ptr<UserWindowControllerImpl> user_window_controller_; |
106 mojo::BindingSet<mojom::UserWindowController> | 107 mojo::BindingSet<mojom::UserWindowController> |
107 user_window_controller_bindings_; | 108 user_window_controller_bindings_; |
108 std::vector<mojo::InterfaceRequest<mojom::UserWindowController>> | 109 std::vector<mojo::InterfaceRequest<mojom::UserWindowController>> |
109 user_window_controller_requests_; | 110 user_window_controller_requests_; |
110 | 111 |
| 112 std::unique_ptr<ui::GpuService> gpu_service_; |
111 std::unique_ptr<WindowManager> window_manager_; | 113 std::unique_ptr<WindowManager> window_manager_; |
112 | 114 |
113 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; | 115 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; |
114 | 116 |
115 mash::session::mojom::SessionPtr session_; | 117 mash::session::mojom::SessionPtr session_; |
116 | 118 |
117 mojo::Binding<mash::session::mojom::ScreenlockStateListener> | 119 mojo::Binding<mash::session::mojom::ScreenlockStateListener> |
118 screenlock_state_listener_binding_; | 120 screenlock_state_listener_binding_; |
119 | 121 |
120 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 122 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
121 }; | 123 }; |
122 | 124 |
123 } // namespace mus | 125 } // namespace mus |
124 } // namespace ash | 126 } // namespace ash |
125 | 127 |
126 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 128 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
OLD | NEW |