| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 class AcceleratorHandler; | 56 class AcceleratorHandler; |
| 57 class WmTestHelper; | 57 class WmTestHelper; |
| 58 | 58 |
| 59 // WindowManager serves as the WindowManagerDelegate and | 59 // WindowManager serves as the WindowManagerDelegate and |
| 60 // WindowTreeClientDelegate for mash. WindowManager creates (and owns) | 60 // WindowTreeClientDelegate for mash. WindowManager creates (and owns) |
| 61 // a RootWindowController per Display. WindowManager takes ownership of | 61 // a RootWindowController per Display. WindowManager takes ownership of |
| 62 // the WindowTreeClient. | 62 // the WindowTreeClient. |
| 63 class WindowManager : public aura::WindowManagerDelegate, | 63 class WindowManager : public aura::WindowManagerDelegate, |
| 64 public aura::WindowTreeClientDelegate { | 64 public aura::WindowTreeClientDelegate { |
| 65 public: | 65 public: |
| 66 WindowManager(service_manager::Connector* connector, Config config); | 66 WindowManager(service_manager::Connector* connector, |
| 67 Config config, |
| 68 bool show_primary_host_on_connect); |
| 67 ~WindowManager() override; | 69 ~WindowManager() override; |
| 68 | 70 |
| 69 void Init(std::unique_ptr<aura::WindowTreeClient> window_tree_client, | 71 void Init(std::unique_ptr<aura::WindowTreeClient> window_tree_client, |
| 70 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool, | 72 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool, |
| 71 std::unique_ptr<ash::ShellDelegate> shell_delegate = nullptr); | 73 std::unique_ptr<ash::ShellDelegate> shell_delegate = nullptr); |
| 72 | 74 |
| 73 // Blocks waiting for the initial set of displays. | 75 // Blocks waiting for the initial set of displays. |
| 74 bool WaitForInitialDisplays(); | 76 bool WaitForInitialDisplays(); |
| 75 | 77 |
| 76 // Called during shutdown to delete all the RootWindowControllers. | 78 // Called during shutdown to delete all the RootWindowControllers. |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 const gfx::Insets& insets, | 188 const gfx::Insets& insets, |
| 187 const std::vector<gfx::Rect>& additional_client_areas) override; | 189 const std::vector<gfx::Rect>& additional_client_areas) override; |
| 188 bool IsWindowActive(aura::Window* window) override; | 190 bool IsWindowActive(aura::Window* window) override; |
| 189 void OnWmDeactivateWindow(aura::Window* window) override; | 191 void OnWmDeactivateWindow(aura::Window* window) override; |
| 190 | 192 |
| 191 service_manager::Connector* connector_; | 193 service_manager::Connector* connector_; |
| 192 display::mojom::DisplayControllerPtr display_controller_; | 194 display::mojom::DisplayControllerPtr display_controller_; |
| 193 | 195 |
| 194 const Config config_; | 196 const Config config_; |
| 195 | 197 |
| 198 const bool show_primary_host_on_connect_; |
| 199 |
| 196 std::unique_ptr<::wm::WMState> wm_state_; | 200 std::unique_ptr<::wm::WMState> wm_state_; |
| 197 std::unique_ptr<aura::PropertyConverter> property_converter_; | 201 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 198 | 202 |
| 199 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 203 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 200 | 204 |
| 201 aura::WindowManagerClient* window_manager_client_ = nullptr; | 205 aura::WindowManagerClient* window_manager_client_ = nullptr; |
| 202 | 206 |
| 203 std::unique_ptr<views::PointerWatcherEventRouter> | 207 std::unique_ptr<views::PointerWatcherEventRouter> |
| 204 pointer_watcher_event_router_; | 208 pointer_watcher_event_router_; |
| 205 | 209 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 225 struct DragState; | 229 struct DragState; |
| 226 std::unique_ptr<DragState> drag_state_; | 230 std::unique_ptr<DragState> drag_state_; |
| 227 | 231 |
| 228 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 232 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 229 }; | 233 }; |
| 230 | 234 |
| 231 } // namespace mus | 235 } // namespace mus |
| 232 } // namespace ash | 236 } // namespace ash |
| 233 | 237 |
| 234 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 238 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |