| 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_H_ | 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_ |
| 6 #define ASH_MUS_WINDOW_MANAGER_H_ | 6 #define ASH_MUS_WINDOW_MANAGER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 namespace display { | 27 namespace display { |
| 28 class Display; | 28 class Display; |
| 29 } | 29 } |
| 30 | 30 |
| 31 namespace service_manager { | 31 namespace service_manager { |
| 32 class Connector; | 32 class Connector; |
| 33 } | 33 } |
| 34 | 34 |
| 35 namespace views { | 35 namespace views { |
| 36 class PointerWatcherEventRouter2; | 36 class PointerWatcherEventRouter; |
| 37 } | 37 } |
| 38 | 38 |
| 39 namespace wm { | 39 namespace wm { |
| 40 class FocusController; | 40 class FocusController; |
| 41 class WMState; | 41 class WMState; |
| 42 } | 42 } |
| 43 | 43 |
| 44 namespace ash { | 44 namespace ash { |
| 45 | 45 |
| 46 class EventClientImpl; | 46 class EventClientImpl; |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 display::mojom::DisplayControllerPtr display_controller_; | 181 display::mojom::DisplayControllerPtr display_controller_; |
| 182 | 182 |
| 183 std::unique_ptr<::wm::FocusController> focus_controller_; | 183 std::unique_ptr<::wm::FocusController> focus_controller_; |
| 184 std::unique_ptr<::wm::WMState> wm_state_; | 184 std::unique_ptr<::wm::WMState> wm_state_; |
| 185 std::unique_ptr<aura::PropertyConverter> property_converter_; | 185 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 186 | 186 |
| 187 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 187 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 188 | 188 |
| 189 aura::WindowManagerClient* window_manager_client_ = nullptr; | 189 aura::WindowManagerClient* window_manager_client_ = nullptr; |
| 190 | 190 |
| 191 std::unique_ptr<views::PointerWatcherEventRouter2> | 191 std::unique_ptr<views::PointerWatcherEventRouter> |
| 192 pointer_watcher_event_router_; | 192 pointer_watcher_event_router_; |
| 193 | 193 |
| 194 std::unique_ptr<ShadowController> shadow_controller_; | 194 std::unique_ptr<ShadowController> shadow_controller_; |
| 195 | 195 |
| 196 RootWindowControllers root_window_controllers_; | 196 RootWindowControllers root_window_controllers_; |
| 197 | 197 |
| 198 base::ObserverList<WindowManagerObserver> observers_; | 198 base::ObserverList<WindowManagerObserver> observers_; |
| 199 | 199 |
| 200 std::unique_ptr<ScreenMus> screen_; | 200 std::unique_ptr<ScreenMus> screen_; |
| 201 | 201 |
| 202 std::unique_ptr<WmShellMus> shell_; | 202 std::unique_ptr<WmShellMus> shell_; |
| 203 | 203 |
| 204 std::unique_ptr<WmLookupMus> lookup_; | 204 std::unique_ptr<WmLookupMus> lookup_; |
| 205 | 205 |
| 206 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; | 206 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; |
| 207 uint16_t next_accelerator_namespace_id_ = 0u; | 207 uint16_t next_accelerator_namespace_id_ = 0u; |
| 208 | 208 |
| 209 std::unique_ptr<EventClientImpl> event_client_; | 209 std::unique_ptr<EventClientImpl> event_client_; |
| 210 | 210 |
| 211 std::unique_ptr<ScreenPositionController> screen_position_controller_; | 211 std::unique_ptr<ScreenPositionController> screen_position_controller_; |
| 212 | 212 |
| 213 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 213 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 214 }; | 214 }; |
| 215 | 215 |
| 216 } // namespace mus | 216 } // namespace mus |
| 217 } // namespace ash | 217 } // namespace ash |
| 218 | 218 |
| 219 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 219 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |