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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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/main.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/public/interfaces/container.mojom.h" 11 #include "ash/public/interfaces/container.mojom.h"
12 #include "services/ui/public/cpp/window_observer.h" 12 #include "services/ui/public/cpp/window_observer.h"
13 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 13 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
14 #include "ui/display/display.h" 14 #include "ui/display/display.h"
15 15
16 namespace gfx { 16 namespace gfx {
17 class Insets; 17 class Insets;
18 } 18 }
19 19
20 namespace shell { 20 namespace service_manager {
21 class Connector; 21 class Connector;
22 } 22 }
23 23
24 namespace ash { 24 namespace ash {
25 25
26 class WorkspaceLayoutManager; 26 class WorkspaceLayoutManager;
27 27
28 namespace mus { 28 namespace mus {
29 29
30 class LayoutManager; 30 class LayoutManager;
31 class WindowManager; 31 class WindowManager;
32 class WmRootWindowControllerMus; 32 class WmRootWindowControllerMus;
33 class WmShelfMus; 33 class WmShelfMus;
34 class WmTestBase; 34 class WmTestBase;
35 class WmTestHelper; 35 class WmTestHelper;
36 class WmWindowMus; 36 class WmWindowMus;
37 37
38 // RootWindowController manages the windows and state for a single display. 38 // RootWindowController manages the windows and state for a single display.
39 // RootWindowController takes ownership of the Window that it passed to it. 39 // RootWindowController takes ownership of the Window that it passed to it.
40 class RootWindowController { 40 class RootWindowController {
41 public: 41 public:
42 RootWindowController(WindowManager* window_manager, 42 RootWindowController(WindowManager* window_manager,
43 ui::Window* root, 43 ui::Window* root,
44 const display::Display& display); 44 const display::Display& display);
45 ~RootWindowController(); 45 ~RootWindowController();
46 46
47 void Shutdown(); 47 void Shutdown();
48 48
49 shell::Connector* GetConnector(); 49 service_manager::Connector* GetConnector();
50 50
51 ui::Window* root() { return root_; } 51 ui::Window* root() { return root_; }
52 WmRootWindowControllerMus* wm_root_window_controller() { 52 WmRootWindowControllerMus* wm_root_window_controller() {
53 return wm_root_window_controller_.get(); 53 return wm_root_window_controller_.get();
54 } 54 }
55 55
56 ui::Window* NewTopLevelWindow( 56 ui::Window* NewTopLevelWindow(
57 std::map<std::string, std::vector<uint8_t>>* properties); 57 std::map<std::string, std::vector<uint8_t>>* properties);
58 58
59 ui::Window* GetWindowForContainer(mojom::Container container); 59 ui::Window* GetWindowForContainer(mojom::Container container);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; 92 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 94 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
95 }; 95 };
96 96
97 } // namespace mus 97 } // namespace mus
98 } // namespace ash 98 } // namespace ash
99 99
100 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 100 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/mus/main.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698