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

Unified Diff: ash/mus/bridge/wm_root_window_controller_mus.cc

Issue 2297893002: Merges RootWindowControllerCommon into WmRootWindowController (Closed)
Patch Set: feedback Created 4 years, 4 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 | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | ash/mus/root_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_root_window_controller_mus.cc
diff --git a/ash/mus/bridge/wm_root_window_controller_mus.cc b/ash/mus/bridge/wm_root_window_controller_mus.cc
index 46bd642b3294172630f36bb124e7871fefe4c3e1..c9bbfa75ac57c76f11db2aafd0812c2240e2cd01 100644
--- a/ash/mus/bridge/wm_root_window_controller_mus.cc
+++ b/ash/mus/bridge/wm_root_window_controller_mus.cc
@@ -4,8 +4,6 @@
#include "ash/mus/bridge/wm_root_window_controller_mus.h"
-#include "ash/common/wm/workspace/workspace_layout_manager.h"
-#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "ash/common/wm_root_window_controller_observer.h"
#include "ash/mus/bridge/wm_shelf_mus.h"
#include "ash/mus/bridge/wm_shell_mus.h"
@@ -36,7 +34,9 @@ namespace mus {
WmRootWindowControllerMus::WmRootWindowControllerMus(
WmShellMus* shell,
RootWindowController* root_window_controller)
- : shell_(shell), root_window_controller_(root_window_controller) {
+ : WmRootWindowController(WmWindowMus::Get(root_window_controller->root())),
+ shell_(shell),
+ root_window_controller_(root_window_controller) {
shell_->AddRootWindowController(this);
root_window_controller_->root()->SetLocalProperty(kWmRootWindowControllerKey,
this);
@@ -84,17 +84,6 @@ WmShell* WmRootWindowControllerMus::GetShell() {
return shell_;
}
-wm::WorkspaceWindowState WmRootWindowControllerMus::GetWorkspaceWindowState() {
- NOTIMPLEMENTED();
- return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
-}
-
-void WmRootWindowControllerMus::SetMaximizeBackdropDelegate(
- std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) {
- root_window_controller_->workspace_layout_manager()
- ->SetMaximizeBackdropDelegate(std::move(delegate));
-}
-
AlwaysOnTopController* WmRootWindowControllerMus::GetAlwaysOnTopController() {
return root_window_controller_->always_on_top_controller();
}
@@ -139,15 +128,5 @@ gfx::Point WmRootWindowControllerMus::GetLastMouseLocationInRoot() {
return location;
}
-void WmRootWindowControllerMus::AddObserver(
- WmRootWindowControllerObserver* observer) {
- observers_.AddObserver(observer);
-}
-
-void WmRootWindowControllerMus::RemoveObserver(
- WmRootWindowControllerObserver* observer) {
- observers_.RemoveObserver(observer);
-}
-
} // namespace mus
} // namespace ash
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | ash/mus/root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698