| 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/tracing_impl.h" | 21 #include "services/tracing/public/cpp/tracing_impl.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; | |
| 32 class WindowTreeClient; | 31 class WindowTreeClient; |
| 33 } | 32 } |
| 34 | 33 |
| 35 namespace ash { | 34 namespace ash { |
| 36 namespace mus { | 35 namespace mus { |
| 37 | 36 |
| 38 class AcceleratorRegistrarImpl; | 37 class AcceleratorRegistrarImpl; |
| 39 class RootWindowController; | 38 class RootWindowController; |
| 40 class ShelfLayoutImpl; | 39 class ShelfLayoutImpl; |
| 41 class UserWindowControllerImpl; | 40 class UserWindowControllerImpl; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 shelf_layout_requests_; | 101 shelf_layout_requests_; |
| 103 | 102 |
| 104 // |user_window_controller_| is created once OnEmbed() is called. Until that | 103 // |user_window_controller_| is created once OnEmbed() is called. Until that |
| 105 // time |user_window_controller_requests_| stores pending interface requests. | 104 // time |user_window_controller_requests_| stores pending interface requests. |
| 106 std::unique_ptr<UserWindowControllerImpl> user_window_controller_; | 105 std::unique_ptr<UserWindowControllerImpl> user_window_controller_; |
| 107 mojo::BindingSet<mojom::UserWindowController> | 106 mojo::BindingSet<mojom::UserWindowController> |
| 108 user_window_controller_bindings_; | 107 user_window_controller_bindings_; |
| 109 std::vector<mojo::InterfaceRequest<mojom::UserWindowController>> | 108 std::vector<mojo::InterfaceRequest<mojom::UserWindowController>> |
| 110 user_window_controller_requests_; | 109 user_window_controller_requests_; |
| 111 | 110 |
| 112 std::unique_ptr<ui::GpuService> gpu_service_; | |
| 113 std::unique_ptr<WindowManager> window_manager_; | 111 std::unique_ptr<WindowManager> window_manager_; |
| 114 | 112 |
| 115 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; | 113 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; |
| 116 | 114 |
| 117 mash::session::mojom::SessionPtr session_; | 115 mash::session::mojom::SessionPtr session_; |
| 118 | 116 |
| 119 mojo::Binding<mash::session::mojom::ScreenlockStateListener> | 117 mojo::Binding<mash::session::mojom::ScreenlockStateListener> |
| 120 screenlock_state_listener_binding_; | 118 screenlock_state_listener_binding_; |
| 121 | 119 |
| 122 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 120 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 123 }; | 121 }; |
| 124 | 122 |
| 125 } // namespace mus | 123 } // namespace mus |
| 126 } // namespace ash | 124 } // namespace ash |
| 127 | 125 |
| 128 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 126 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |