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

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

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback 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/non_client_frame_controller.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/root_window_controller.h" 11 #include "ash/root_window_controller.h"
12 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 12 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
13 #include "ui/display/display.h" 13 #include "ui/display/display.h"
14 14
15 namespace aura { 15 namespace aura {
16 class WindowTreeHostMus; 16 class WindowTreeHostMus;
17 } 17 }
18 18
19 namespace gfx { 19 namespace gfx {
20 class Insets; 20 class Insets;
21 } 21 }
22 22
23 namespace service_manager { 23 namespace service_manager {
24 class Connector; 24 class Connector;
25 } 25 }
26 26
27 namespace ash { 27 namespace ash {
28 28
29 class WmWindowAura; 29 class WmWindow;
30 30
31 namespace mus { 31 namespace mus {
32 32
33 class WindowManager; 33 class WindowManager;
34 class WmTestBase; 34 class WmTestBase;
35 class WmTestHelper; 35 class WmTestHelper;
36 36
37 // RootWindowController manages the windows and state for a single display. 37 // RootWindowController manages the windows and state for a single display.
38 // RootWindowController takes ownership of the WindowTreeHostMus that it passed 38 // RootWindowController takes ownership of the WindowTreeHostMus that it passed
39 // to it. 39 // to it.
(...skipping 15 matching lines...) Expand all
55 55
56 service_manager::Connector* GetConnector(); 56 service_manager::Connector* GetConnector();
57 57
58 aura::Window* root(); 58 aura::Window* root();
59 const aura::Window* root() const; 59 const aura::Window* root() const;
60 60
61 aura::Window* NewTopLevelWindow( 61 aura::Window* NewTopLevelWindow(
62 ui::mojom::WindowType window_type, 62 ui::mojom::WindowType window_type,
63 std::map<std::string, std::vector<uint8_t>>* properties); 63 std::map<std::string, std::vector<uint8_t>>* properties);
64 64
65 ash::WmWindowAura* GetWindowByShellWindowId(int id); 65 WmWindow* GetWindowByShellWindowId(int id);
66 66
67 void SetWorkAreaInests(const gfx::Insets& insets); 67 void SetWorkAreaInests(const gfx::Insets& insets);
68 void SetDisplay(const display::Display& display); 68 void SetDisplay(const display::Display& display);
69 69
70 WindowManager* window_manager() { return window_manager_; } 70 WindowManager* window_manager() { return window_manager_; }
71 71
72 aura::WindowTreeHostMus* window_tree_host() { return window_tree_host_; } 72 aura::WindowTreeHostMus* window_tree_host() { return window_tree_host_; }
73 73
74 const display::Display& display() const { return display_; } 74 const display::Display& display() const { return display_; }
75 75
(...skipping 20 matching lines...) Expand all
96 96
97 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; 97 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_;
98 98
99 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 99 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
100 }; 100 };
101 101
102 } // namespace mus 102 } // namespace mus
103 } // namespace ash 103 } // namespace ash
104 104
105 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 105 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/mus/non_client_frame_controller.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698