| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 MASH_WM_ROOT_WINDOW_CONTROLLER_H_ | 5 #ifndef MASH_WM_ROOT_WINDOW_CONTROLLER_H_ |
| 6 #define MASH_WM_ROOT_WINDOW_CONTROLLER_H_ | 6 #define MASH_WM_ROOT_WINDOW_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "components/mus/public/cpp/window_observer.h" | 10 #include "components/mus/public/cpp/window_observer.h" |
| 9 #include "components/mus/public/cpp/window_tree_delegate.h" | 11 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 10 #include "components/mus/public/interfaces/window_manager_constants.mojom.h" | 12 #include "components/mus/public/interfaces/window_manager_constants.mojom.h" |
| 11 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 13 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
| 12 #include "mash/wm/public/interfaces/container.mojom.h" | 14 #include "mash/wm/public/interfaces/container.mojom.h" |
| 13 #include "mojo/public/cpp/bindings/binding.h" | 15 #include "mojo/public/cpp/bindings/binding.h" |
| 14 | 16 |
| 15 namespace mojo { | 17 namespace mojo { |
| 16 class Connector; | 18 class Connector; |
| 17 } | 19 } |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 81 |
| 80 // Sets up the window containers used for z-space management. | 82 // Sets up the window containers used for z-space management. |
| 81 void CreateContainer(mash::wm::mojom::Container container, | 83 void CreateContainer(mash::wm::mojom::Container container, |
| 82 mash::wm::mojom::Container parent_container); | 84 mash::wm::mojom::Container parent_container); |
| 83 void CreateContainers(); | 85 void CreateContainers(); |
| 84 | 86 |
| 85 WindowManagerApplication* app_; | 87 WindowManagerApplication* app_; |
| 86 mus::Window* root_; | 88 mus::Window* root_; |
| 87 int window_count_; | 89 int window_count_; |
| 88 | 90 |
| 89 scoped_ptr<WindowManager> window_manager_; | 91 std::unique_ptr<WindowManager> window_manager_; |
| 90 | 92 |
| 91 std::map<mus::Window*, scoped_ptr<LayoutManager>> layout_manager_; | 93 std::map<mus::Window*, std::unique_ptr<LayoutManager>> layout_manager_; |
| 92 | 94 |
| 93 scoped_ptr<ShadowController> shadow_controller_; | 95 std::unique_ptr<ShadowController> shadow_controller_; |
| 94 | 96 |
| 95 mus::mojom::DisplayPtr display_; | 97 mus::mojom::DisplayPtr display_; |
| 96 | 98 |
| 97 DISALLOW_COPY_AND_ASSIGN(RootWindowController); | 99 DISALLOW_COPY_AND_ASSIGN(RootWindowController); |
| 98 }; | 100 }; |
| 99 | 101 |
| 100 } // namespace wm | 102 } // namespace wm |
| 101 } // namespace mash | 103 } // namespace mash |
| 102 | 104 |
| 103 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_ | 105 #endif // MASH_WM_ROOT_WINDOW_CONTROLLER_H_ |
| OLD | NEW |