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

Unified Diff: mash/wm/root_window_controller.h

Issue 1954933002: Initial cut of ash/wm/common classes for mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/wm/public/interfaces/container.mojom ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/root_window_controller.h
diff --git a/mash/wm/root_window_controller.h b/mash/wm/root_window_controller.h
index fa54145166e284e4badec9f990699e701b3fe0bb..68e2cb6ea6e64b3cfdc1db43f6f98017fb9f7b4c 100644
--- a/mash/wm/root_window_controller.h
+++ b/mash/wm/root_window_controller.h
@@ -13,6 +13,7 @@
#include "components/mus/public/interfaces/window_tree_host.mojom.h"
#include "mash/wm/public/interfaces/container.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
+#include "ui/gfx/display.h"
namespace mus {
class WindowManagerClient;
@@ -67,6 +68,8 @@ class RootWindowController : public mus::WindowObserver,
void OnAccelerator(uint32_t id, const ui::Event& event);
+ const gfx::Display& display() const { return display_; }
+
ShelfLayoutManager* GetShelfLayoutManager();
StatusLayoutManager* GetStatusLayoutManager();
@@ -99,7 +102,7 @@ class RootWindowController : public mus::WindowObserver,
std::unique_ptr<ShadowController> shadow_controller_;
- mus::mojom::DisplayPtr display_;
+ gfx::Display display_;
DISALLOW_COPY_AND_ASSIGN(RootWindowController);
};
« no previous file with comments | « mash/wm/public/interfaces/container.mojom ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698