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

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

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase 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/property_util.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"
12 #include "services/ui/public/cpp/window_observer.h" 11 #include "services/ui/public/cpp/window_observer.h"
13 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 12 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
14 #include "ui/display/display.h" 13 #include "ui/display/display.h"
15 14
16 namespace gfx { 15 namespace gfx {
17 class Insets; 16 class Insets;
18 } 17 }
19 18
20 namespace service_manager { 19 namespace service_manager {
21 class Connector; 20 class Connector;
(...skipping 27 matching lines...) Expand all
49 service_manager::Connector* GetConnector(); 48 service_manager::Connector* GetConnector();
50 49
51 ui::Window* root() { return root_; } 50 ui::Window* root() { return root_; }
52 WmRootWindowControllerMus* wm_root_window_controller() { 51 WmRootWindowControllerMus* wm_root_window_controller() {
53 return wm_root_window_controller_.get(); 52 return wm_root_window_controller_.get();
54 } 53 }
55 54
56 ui::Window* NewTopLevelWindow( 55 ui::Window* NewTopLevelWindow(
57 std::map<std::string, std::vector<uint8_t>>* properties); 56 std::map<std::string, std::vector<uint8_t>>* properties);
58 57
59 ui::Window* GetWindowForContainer(mojom::Container container);
60
61 WmWindowMus* GetWindowByShellWindowId(int id); 58 WmWindowMus* GetWindowByShellWindowId(int id);
62 59
63 void SetWorkAreaInests(const gfx::Insets& insets); 60 void SetWorkAreaInests(const gfx::Insets& insets);
64 61
65 WindowManager* window_manager() { return window_manager_; } 62 WindowManager* window_manager() { return window_manager_; }
66 63
67 const display::Display& display() const { return display_; } 64 const display::Display& display() const { return display_; }
68 65
69 WmShelfMus* wm_shelf() { return wm_shelf_.get(); } 66 WmShelfMus* wm_shelf() { return wm_shelf_.get(); }
70 67
(...skipping 20 matching lines...) Expand all
91 88
92 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_; 89 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_;
93 90
94 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 91 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
95 }; 92 };
96 93
97 } // namespace mus 94 } // namespace mus
98 } // namespace ash 95 } // namespace ash
99 96
100 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 97 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/mus/property_util.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698