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

Unified Diff: mash/wm/bridge/wm_root_window_controller_mus.cc

Issue 1994763002: Wires up WorkspaceLayoutManager in mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: data deps 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/BUILD.gn ('k') | mash/wm/bridge/wm_window_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/bridge/wm_root_window_controller_mus.cc
diff --git a/mash/wm/bridge/wm_root_window_controller_mus.cc b/mash/wm/bridge/wm_root_window_controller_mus.cc
index f98a00764cd08b8cd3053bdcee625931f05180b4..ecabe2b2cc1de3b14a2b59d6123163a8c20162e2 100644
--- a/mash/wm/bridge/wm_root_window_controller_mus.cc
+++ b/mash/wm/bridge/wm_root_window_controller_mus.cc
@@ -9,7 +9,9 @@
#include "components/mus/public/cpp/window_property.h"
#include "components/mus/public/cpp/window_tree_connection.h"
#include "mash/wm/bridge/wm_globals_mus.h"
+#include "mash/wm/bridge/wm_shelf_mus.h"
#include "mash/wm/bridge/wm_window_mus.h"
+#include "mash/wm/container_ids.h"
#include "mash/wm/root_window_controller.h"
#include "ui/display/display.h"
#include "ui/views/mus/native_widget_mus.h"
@@ -74,8 +76,7 @@ const display::Display& WmRootWindowControllerMus::GetDisplay() const {
}
bool WmRootWindowControllerMus::HasShelf() {
- NOTIMPLEMENTED();
- return false;
+ return GetShelf() != nullptr;
}
ash::wm::WmGlobals* WmRootWindowControllerMus::GetGlobals() {
@@ -90,13 +91,11 @@ WmRootWindowControllerMus::GetWorkspaceWindowState() {
ash::AlwaysOnTopController*
WmRootWindowControllerMus::GetAlwaysOnTopController() {
- NOTIMPLEMENTED();
- return nullptr;
+ return root_window_controller_->always_on_top_controller();
}
ash::wm::WmShelf* WmRootWindowControllerMus::GetShelf() {
- NOTIMPLEMENTED();
- return nullptr;
+ return root_window_controller_->wm_shelf();
}
ash::wm::WmWindow* WmRootWindowControllerMus::GetWindow() {
« no previous file with comments | « mash/wm/BUILD.gn ('k') | mash/wm/bridge/wm_window_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698