| 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 28 matching lines...) Expand all Loading... |
| 39 class WMState; | 39 class WMState; |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace ash { | 42 namespace ash { |
| 43 | 43 |
| 44 class RootWindowController; | 44 class RootWindowController; |
| 45 class ScreenMus; | 45 class ScreenMus; |
| 46 class ShellDelegate; | 46 class ShellDelegate; |
| 47 | 47 |
| 48 namespace test { | 48 namespace test { |
| 49 class AshEventGeneratorDelegate; |
| 49 class AshTestHelper; | 50 class AshTestHelper; |
| 50 } | 51 } |
| 51 | 52 |
| 52 namespace mus { | 53 namespace mus { |
| 53 | 54 |
| 54 class AcceleratorHandler; | 55 class AcceleratorHandler; |
| 55 class WmTestHelper; | 56 class WmTestHelper; |
| 56 | 57 |
| 57 // WindowManager serves as the WindowManagerDelegate and | 58 // WindowManager serves as the WindowManagerDelegate and |
| 58 // WindowTreeClientDelegate for mash. WindowManager creates (and owns) | 59 // WindowTreeClientDelegate for mash. WindowManager creates (and owns) |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 // Returns the DisplayController interface if available. Will be null if no | 99 // Returns the DisplayController interface if available. Will be null if no |
| 99 // service_manager::Connector was available, for example in some tests. | 100 // service_manager::Connector was available, for example in some tests. |
| 100 display::mojom::DisplayController* GetDisplayController(); | 101 display::mojom::DisplayController* GetDisplayController(); |
| 101 | 102 |
| 102 // Called during creation of the shell to create a RootWindowController. | 103 // Called during creation of the shell to create a RootWindowController. |
| 103 // See comment in CreateRootWindowController() for details. | 104 // See comment in CreateRootWindowController() for details. |
| 104 void CreatePrimaryRootWindowController( | 105 void CreatePrimaryRootWindowController( |
| 105 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host); | 106 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host); |
| 106 | 107 |
| 107 private: | 108 private: |
| 108 friend class ash::test::AshTestHelper; | 109 friend class test::AshEventGeneratorDelegate; |
| 110 friend class test::AshTestHelper; |
| 109 friend class WmTestHelper; | 111 friend class WmTestHelper; |
| 110 | 112 |
| 111 using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>; | 113 using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>; |
| 112 | 114 |
| 113 // Called once the first Display has been obtained. | 115 // Called once the first Display has been obtained. |
| 114 void CreateShell( | 116 void CreateShell( |
| 115 std::unique_ptr<aura::WindowTreeHostMus> primary_window_tree_host); | 117 std::unique_ptr<aura::WindowTreeHostMus> primary_window_tree_host); |
| 116 | 118 |
| 117 void CreateAndRegisterRootWindowController( | 119 void CreateAndRegisterRootWindowController( |
| 118 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, | 120 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 // See WmShellMus's constructor for details. Tests may set to false. | 201 // See WmShellMus's constructor for details. Tests may set to false. |
| 200 bool create_session_state_delegate_stub_for_test_ = true; | 202 bool create_session_state_delegate_stub_for_test_ = true; |
| 201 | 203 |
| 202 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 204 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 203 }; | 205 }; |
| 204 | 206 |
| 205 } // namespace mus | 207 } // namespace mus |
| 206 } // namespace ash | 208 } // namespace ash |
| 207 | 209 |
| 208 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 210 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |