| 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 ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ | 5 #ifndef ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ |
| 6 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ | 6 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/mus/disconnected_app_handler.h" | 10 #include "ash/mus/disconnected_app_handler.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 76 |
| 77 gfx::Rect CalculateDefaultBounds(ui::Window* window) const; | 77 gfx::Rect CalculateDefaultBounds(ui::Window* window) const; |
| 78 gfx::Rect GetMaximizedWindowBounds() const; | 78 gfx::Rect GetMaximizedWindowBounds() const; |
| 79 | 79 |
| 80 // ShelfLayoutManagerDelegate: | 80 // ShelfLayoutManagerDelegate: |
| 81 void OnShelfWindowAvailable() override; | 81 void OnShelfWindowAvailable() override; |
| 82 | 82 |
| 83 // Creates the necessary set of layout managers in the shell windows. | 83 // Creates the necessary set of layout managers in the shell windows. |
| 84 void CreateLayoutManagers(); | 84 void CreateLayoutManagers(); |
| 85 | 85 |
| 86 // Creates the status area widget that contains the system tray menu. | |
| 87 void CreateStatusArea(); | |
| 88 | |
| 89 WindowManager* window_manager_; | 86 WindowManager* window_manager_; |
| 90 ui::Window* root_; | 87 ui::Window* root_; |
| 91 int window_count_ = 0; | 88 int window_count_ = 0; |
| 92 | 89 |
| 93 display::Display display_; | 90 display::Display display_; |
| 94 | 91 |
| 95 std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_; | 92 std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_; |
| 96 | 93 |
| 97 std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_; | 94 std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_; |
| 98 std::unique_ptr<WmShelfMus> wm_shelf_; | 95 std::unique_ptr<WmShelfMus> wm_shelf_; |
| 99 | 96 |
| 100 // Owned by the corresponding container. | 97 // Owned by the corresponding container. |
| 101 WorkspaceLayoutManager* workspace_layout_manager_ = nullptr; | 98 WorkspaceLayoutManager* workspace_layout_manager_ = nullptr; |
| 102 std::map<ui::Window*, std::unique_ptr<LayoutManager>> layout_managers_; | 99 std::map<ui::Window*, std::unique_ptr<LayoutManager>> layout_managers_; |
| 103 | 100 |
| 104 std::unique_ptr<AlwaysOnTopController> always_on_top_controller_; | 101 std::unique_ptr<AlwaysOnTopController> always_on_top_controller_; |
| 105 | 102 |
| 106 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; | 103 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; |
| 107 | 104 |
| 108 DISALLOW_COPY_AND_ASSIGN(RootWindowController); | 105 DISALLOW_COPY_AND_ASSIGN(RootWindowController); |
| 109 }; | 106 }; |
| 110 | 107 |
| 111 } // namespace mus | 108 } // namespace mus |
| 112 } // namespace ash | 109 } // namespace ash |
| 113 | 110 |
| 114 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ | 111 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ |
| OLD | NEW |