Merges RootWindowControllerCommon into WmRootWindowController

ash/mus/bridge/wm_root_window_controller_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/window_manager.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
@@ skipping 10 matching lines @@
                                      nullptr);
 
 }  // namespace
 
 namespace ash {
 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);
 }
 
 WmRootWindowControllerMus::~WmRootWindowControllerMus() {
   shell_->RemoveRootWindowController(this);
 }
 
 // static
@@ skipping 27 matching lines @@
 }
 
 bool WmRootWindowControllerMus::HasShelf() {
   return GetShelf() != nullptr;
 }
 
 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();
 }
 
 WmShelf* WmRootWindowControllerMus::GetShelf() {
   return root_window_controller_->wm_shelf();
 }
 
 WmWindow* WmRootWindowControllerMus::GetWindow() {
   return WmWindowMus::Get(root_window_controller_->root());
@@ skipping 24 matching lines @@
 
 gfx::Point WmRootWindowControllerMus::GetLastMouseLocationInRoot() {
   gfx::Point location = root_window_controller_->window_manager()
                             ->window_tree_client()
                             ->GetCursorScreenPoint();
   location -=
       root_window_controller_->display().bounds().origin().OffsetFromOrigin();
   return location;
 }
 
-void WmRootWindowControllerMus::AddObserver(
-    WmRootWindowControllerObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void WmRootWindowControllerMus::RemoveObserver(
-    WmRootWindowControllerObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
 }  // namespace mus
 }  // namespace ash