| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 class ScreenMus; | 45 class ScreenMus; |
| 46 class ShellDelegate; | 46 class ShellDelegate; |
| 47 | 47 |
| 48 namespace test { | 48 namespace test { |
| 49 class AshTestHelper; | 49 class AshTestHelper; |
| 50 } | 50 } |
| 51 | 51 |
| 52 namespace mus { | 52 namespace mus { |
| 53 | 53 |
| 54 class AcceleratorHandler; | 54 class AcceleratorHandler; |
| 55 class WmLookupMus; | |
| 56 class WmTestHelper; | 55 class WmTestHelper; |
| 57 | 56 |
| 58 // WindowManager serves as the WindowManagerDelegate and | 57 // WindowManager serves as the WindowManagerDelegate and |
| 59 // WindowTreeClientDelegate for mash. WindowManager creates (and owns) | 58 // WindowTreeClientDelegate for mash. WindowManager creates (and owns) |
| 60 // a RootWindowController per Display. WindowManager takes ownership of | 59 // a RootWindowController per Display. WindowManager takes ownership of |
| 61 // the WindowTreeClient. | 60 // the WindowTreeClient. |
| 62 class WindowManager : public aura::WindowManagerDelegate, | 61 class WindowManager : public aura::WindowManagerDelegate, |
| 63 public aura::WindowTreeClientDelegate { | 62 public aura::WindowTreeClientDelegate { |
| 64 public: | 63 public: |
| 65 explicit WindowManager(service_manager::Connector* connector); | 64 explicit WindowManager(service_manager::Connector* connector); |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 | 181 |
| 183 std::unique_ptr<views::PointerWatcherEventRouter> | 182 std::unique_ptr<views::PointerWatcherEventRouter> |
| 184 pointer_watcher_event_router_; | 183 pointer_watcher_event_router_; |
| 185 | 184 |
| 186 RootWindowControllers root_window_controllers_; | 185 RootWindowControllers root_window_controllers_; |
| 187 | 186 |
| 188 std::unique_ptr<ScreenMus> screen_; | 187 std::unique_ptr<ScreenMus> screen_; |
| 189 | 188 |
| 190 bool created_shell_ = false; | 189 bool created_shell_ = false; |
| 191 | 190 |
| 192 std::unique_ptr<WmLookupMus> lookup_; | |
| 193 | |
| 194 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; | 191 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; |
| 195 uint16_t next_accelerator_namespace_id_ = 0u; | 192 uint16_t next_accelerator_namespace_id_ = 0u; |
| 196 | 193 |
| 197 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 194 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 198 | 195 |
| 199 // Only set in tests. If non-null this is used as the shell delegate. | 196 // Only set in tests. If non-null this is used as the shell delegate. |
| 200 std::unique_ptr<ShellDelegate> shell_delegate_for_test_; | 197 std::unique_ptr<ShellDelegate> shell_delegate_for_test_; |
| 201 | 198 |
| 202 // See WmShellMus's constructor for details. Tests may set to false. | 199 // See WmShellMus's constructor for details. Tests may set to false. |
| 203 bool create_session_state_delegate_stub_for_test_ = true; | 200 bool create_session_state_delegate_stub_for_test_ = true; |
| 204 | 201 |
| 205 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 202 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 206 }; | 203 }; |
| 207 | 204 |
| 208 } // namespace mus | 205 } // namespace mus |
| 209 } // namespace ash | 206 } // namespace ash |
| 210 | 207 |
| 211 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 208 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |