Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: ash/mus/root_window_controller.h

Issue 2103913003: Converts MaximizeModeWindowManager to use ash/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@maximize_mode_event_handler
Patch Set: fix chrome Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/mus/bridge/wm_window_mus.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "ash/mus/shelf_layout_manager_delegate.h" 11 #include "ash/mus/shelf_layout_manager_delegate.h"
12 #include "ash/public/interfaces/container.mojom.h" 12 #include "ash/public/interfaces/container.mojom.h"
13 #include "components/mus/public/cpp/window_observer.h" 13 #include "components/mus/public/cpp/window_observer.h"
14 #include "components/mus/public/interfaces/window_manager_constants.mojom.h" 14 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
15 #include "ui/display/display.h" 15 #include "ui/display/display.h"
16 16
17 namespace shell { 17 namespace shell {
18 class Connector; 18 class Connector;
19 } 19 }
20 20
21 namespace ash { 21 namespace ash {
22 22
23 class AlwaysOnTopController; 23 class AlwaysOnTopController;
24 class RootWindowControllerCommon; 24 class RootWindowControllerCommon;
25 class WorkspaceLayoutManager;
25 26
26 namespace mus { 27 namespace mus {
27 28
28 class LayoutManager; 29 class LayoutManager;
29 class ShelfLayoutManager; 30 class ShelfLayoutManager;
30 class StatusLayoutManager; 31 class StatusLayoutManager;
31 class WindowManager; 32 class WindowManager;
32 class WmRootWindowControllerMus; 33 class WmRootWindowControllerMus;
33 class WmShelfMus; 34 class WmShelfMus;
34 class WmTestBase; 35 class WmTestBase;
(...skipping 23 matching lines...) Expand all
58 ::mus::Window* GetWindowForContainer(mojom::Container container); 59 ::mus::Window* GetWindowForContainer(mojom::Container container);
59 60
60 WmWindowMus* GetWindowByShellWindowId(int id); 61 WmWindowMus* GetWindowByShellWindowId(int id);
61 62
62 WindowManager* window_manager() { return window_manager_; } 63 WindowManager* window_manager() { return window_manager_; }
63 64
64 const display::Display& display() const { return display_; } 65 const display::Display& display() const { return display_; }
65 66
66 ShelfLayoutManager* GetShelfLayoutManager(); 67 ShelfLayoutManager* GetShelfLayoutManager();
67 StatusLayoutManager* GetStatusLayoutManager(); 68 StatusLayoutManager* GetStatusLayoutManager();
69 WorkspaceLayoutManager* workspace_layout_manager() {
70 return workspace_layout_manager_;
71 }
68 72
69 AlwaysOnTopController* always_on_top_controller() { 73 AlwaysOnTopController* always_on_top_controller() {
70 return always_on_top_controller_.get(); 74 return always_on_top_controller_.get();
71 } 75 }
72 76
73 WmShelfMus* wm_shelf() { return wm_shelf_.get(); } 77 WmShelfMus* wm_shelf() { return wm_shelf_.get(); }
74 78
75 private: 79 private:
76 friend class WmTestBase; 80 friend class WmTestBase;
77 friend class WmTestHelper; 81 friend class WmTestHelper;
(...skipping 11 matching lines...) Expand all
89 ::mus::Window* root_; 93 ::mus::Window* root_;
90 int window_count_ = 0; 94 int window_count_ = 0;
91 95
92 display::Display display_; 96 display::Display display_;
93 97
94 std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_; 98 std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_;
95 99
96 std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_; 100 std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
97 std::unique_ptr<WmShelfMus> wm_shelf_; 101 std::unique_ptr<WmShelfMus> wm_shelf_;
98 102
103 // Owned by the corresponding container.
104 WorkspaceLayoutManager* workspace_layout_manager_ = nullptr;
99 std::map<::mus::Window*, std::unique_ptr<LayoutManager>> layout_managers_; 105 std::map<::mus::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
100 106
101 std::unique_ptr<AlwaysOnTopController> always_on_top_controller_; 107 std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
102 108
103 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; 109 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_;
104 110
105 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 111 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
106 }; 112 };
107 113
108 } // namespace mus 114 } // namespace mus
109 } // namespace ash 115 } // namespace ash
110 116
111 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 117 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_window_mus.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698