| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 // Returns the DisplayController interface if available. Will be null if no | 98 // Returns the DisplayController interface if available. Will be null if no |
| 99 // service_manager::Connector was available, for example in some tests. | 99 // service_manager::Connector was available, for example in some tests. |
| 100 display::mojom::DisplayController* GetDisplayController(); | 100 display::mojom::DisplayController* GetDisplayController(); |
| 101 | 101 |
| 102 // Called during creation of the shell to create a RootWindowController. | 102 // Called during creation of the shell to create a RootWindowController. |
| 103 // See comment in CreateRootWindowController() for details. | 103 // See comment in CreateRootWindowController() for details. |
| 104 void CreatePrimaryRootWindowController( | 104 void CreatePrimaryRootWindowController( |
| 105 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host); | 105 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host); |
| 106 | 106 |
| 107 private: | 107 private: |
| 108 friend class ash::test::AshTestHelper; | 108 friend class test::AshTestHelper; |
| 109 friend class WmTestHelper; | 109 friend class WmTestHelper; |
| 110 | 110 |
| 111 using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>; | 111 using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>; |
| 112 | 112 |
| 113 // Called once the first Display has been obtained. | 113 // Called once the first Display has been obtained. |
| 114 void CreateShell( | 114 void CreateShell( |
| 115 std::unique_ptr<aura::WindowTreeHostMus> primary_window_tree_host); | 115 std::unique_ptr<aura::WindowTreeHostMus> primary_window_tree_host); |
| 116 | 116 |
| 117 void CreateAndRegisterRootWindowController( | 117 void CreateAndRegisterRootWindowController( |
| 118 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, | 118 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. | 199 // See WmShellMus's constructor for details. Tests may set to false. |
| 200 bool create_session_state_delegate_stub_for_test_ = true; | 200 bool create_session_state_delegate_stub_for_test_ = true; |
| 201 | 201 |
| 202 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 202 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
| 203 }; | 203 }; |
| 204 | 204 |
| 205 } // namespace mus | 205 } // namespace mus |
| 206 } // namespace ash | 206 } // namespace ash |
| 207 | 207 |
| 208 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 208 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
| OLD | NEW |