Merges RootWindowControllerCommon into WmRootWindowController

ash/aura/wm_root_window_controller_aura.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/aura/wm_root_window_controller_aura.h"
 
 #include "ash/aura/wm_shelf_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/shelf_widget.h"
-#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
-#include "ash/common/wm/workspace_controller.h"
 #include "ash/common/wm_root_window_controller_observer.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/display/screen.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/event_utils.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::WmRootWindowControllerAura*);
 
 namespace ash {
 
 // TODO(sky): it likely makes more sense to hang this off RootWindowSettings.
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::WmRootWindowControllerAura,
                                  kWmRootWindowControllerKey,
                                  nullptr);
 
 WmRootWindowControllerAura::WmRootWindowControllerAura(
     RootWindowController* root_window_controller)
-    : root_window_controller_(root_window_controller) {
+    : WmRootWindowController(
+          WmWindowAura::Get(root_window_controller->GetRootWindow())),
+      root_window_controller_(root_window_controller) {
   root_window_controller_->GetRootWindow()->SetProperty(
       kWmRootWindowControllerKey, this);
   WmShell::Get()->AddShellObserver(this);
   display::Screen::GetScreen()->AddObserver(this);
 }
 
 WmRootWindowControllerAura::~WmRootWindowControllerAura() {
   WmShell::Get()->RemoveShellObserver(this);
   display::Screen::GetScreen()->RemoveObserver(this);
 }
@@ skipping 20 matching lines @@
 }
 
 bool WmRootWindowControllerAura::HasShelf() {
   return root_window_controller_->shelf_widget() != nullptr;
 }
 
 WmShell* WmRootWindowControllerAura::GetShell() {
   return WmShell::Get();
 }
 
-wm::WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() {
-  if (!root_window_controller_->workspace_controller())
-    return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
-  return root_window_controller_->workspace_controller()->GetWindowState();
-}
-
-void WmRootWindowControllerAura::SetMaximizeBackdropDelegate(
-    std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) {
-  root_window_controller_->workspace_controller()->SetMaximizeBackdropDelegate(
-      std::move(delegate));
-}
-
 AlwaysOnTopController* WmRootWindowControllerAura::GetAlwaysOnTopController() {
   return root_window_controller_->always_on_top_controller();
 }
 
 WmShelf* WmRootWindowControllerAura::GetShelf() {
   return root_window_controller_->wm_shelf_aura();
 }
 
 WmWindow* WmRootWindowControllerAura::GetWindow() {
   return WmWindowAura::Get(root_window_controller_->GetRootWindow());
@@ skipping 20 matching lines @@
                                        ->FindTargetForEvent(root, &test_event);
   return WmWindowAura::Get(static_cast<aura::Window*>(event_handler));
 }
 
 gfx::Point WmRootWindowControllerAura::GetLastMouseLocationInRoot() {
   return root_window_controller_->GetHost()
       ->dispatcher()
       ->GetLastMouseLocationInRoot();
 }
 
-void WmRootWindowControllerAura::AddObserver(
-    WmRootWindowControllerObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void WmRootWindowControllerAura::RemoveObserver(
-    WmRootWindowControllerObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
 void WmRootWindowControllerAura::OnShelfAlignmentChanged(
     WmWindow* root_window) {
   if (WmWindowAura::GetAuraWindow(root_window) !=
       root_window_controller_->GetRootWindow())
     return;
 
-  FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
+  FOR_EACH_OBSERVER(WmRootWindowControllerObserver, *observers(),
                     OnShelfAlignmentChanged());
 }
 
 void WmRootWindowControllerAura::OnDisplayAdded(
     const display::Display& display) {}
 
 void WmRootWindowControllerAura::OnDisplayRemoved(
     const display::Display& display) {}
 
 void WmRootWindowControllerAura::OnDisplayMetricsChanged(
     const display::Display& display,
     uint32_t metrics) {
-  FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
+  FOR_EACH_OBSERVER(WmRootWindowControllerObserver, *observers(),
                     OnWorkAreaChanged());
 }
 
-}  // namespace ash
+}  // namespace ash