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

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

Issue 2620913003: Removes WmRootWindowController subclasses (Closed)
Patch Set: spelling Created 3 years, 11 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/root_window_controller.cc ('k') | ash/mus/window_manager.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 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>
11 #include <set> 11 #include <set>
12 12
13 #include "ash/root_window_controller.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/observer_list.h" 16 #include "base/observer_list.h"
16 #include "services/ui/common/types.h" 17 #include "services/ui/common/types.h"
17 #include "services/ui/public/interfaces/display/display_controller.mojom.h" 18 #include "services/ui/public/interfaces/display/display_controller.mojom.h"
18 #include "services/ui/public/interfaces/window_manager.mojom.h" 19 #include "services/ui/public/interfaces/window_manager.mojom.h"
19 #include "ui/aura/env_observer.h" 20 #include "ui/aura/env_observer.h"
20 #include "ui/aura/mus/window_manager_delegate.h" 21 #include "ui/aura/mus/window_manager_delegate.h"
21 #include "ui/aura/mus/window_tree_client_delegate.h" 22 #include "ui/aura/mus/window_tree_client_delegate.h"
22 23
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // service_manager::Connector was available, for example in some tests. 121 // service_manager::Connector was available, for example in some tests.
121 display::mojom::DisplayController* GetDisplayController(); 122 display::mojom::DisplayController* GetDisplayController();
122 123
123 private: 124 private:
124 friend class WmTestHelper; 125 friend class WmTestHelper;
125 126
126 using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>; 127 using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>;
127 128
128 RootWindowController* CreateRootWindowController( 129 RootWindowController* CreateRootWindowController(
129 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, 130 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
130 const display::Display& display); 131 const display::Display& display,
132 ash::RootWindowController::RootWindowType root_window_type);
131 133
132 // Deletes the specified RootWindowController. Called when a display is 134 // Deletes the specified RootWindowController. Called when a display is
133 // removed. 135 // removed.
134 void DestroyRootWindowController( 136 void DestroyRootWindowController(
135 RootWindowController* root_window_controller); 137 RootWindowController* root_window_controller);
136 138
137 void Shutdown(); 139 void Shutdown();
138 140
139 RootWindowController* GetPrimaryRootWindowController(); 141 RootWindowController* GetPrimaryRootWindowController();
140 142
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 220
219 std::unique_ptr<ScreenPositionController> screen_position_controller_; 221 std::unique_ptr<ScreenPositionController> screen_position_controller_;
220 222
221 DISALLOW_COPY_AND_ASSIGN(WindowManager); 223 DISALLOW_COPY_AND_ASSIGN(WindowManager);
222 }; 224 };
223 225
224 } // namespace mus 226 } // namespace mus
225 } // namespace ash 227 } // namespace ash
226 228
227 #endif // ASH_MUS_WINDOW_MANAGER_H_ 229 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/mus/root_window_controller.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698