Merges RootWindowControllerCommon into WmRootWindowController

ash/common/wm_root_window_controller.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/common/root_window_controller_common.h"
+#include "ash/common/wm_root_window_controller.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/common/wm/workspace_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "base/memory/ptr_util.h"
 
 namespace ash {
 namespace {
 
 // Creates a new window for use as a container.
 WmWindow* CreateContainer(int window_id, const char* name, WmWindow* parent) {
   WmWindow* window = WmShell::Get()->NewContainerWindow();
   window->SetShellWindowId(window_id);
   window->SetName(name);
   parent->AddChild(window);
   if (window_id != kShellWindowId_UnparentedControlContainer)
     window->Show();
   return window;
 }
 
 }  // namespace
 
-RootWindowControllerCommon::RootWindowControllerCommon(WmWindow* root)
-    : root_(root), root_window_layout_(nullptr) {}
+WmRootWindowController::WmRootWindowController(WmWindow* root)
+    : root_(root), root_window_layout_manager_(nullptr) {}
 
-RootWindowControllerCommon::~RootWindowControllerCommon() {}
+WmRootWindowController::~WmRootWindowController() {}
 
-void RootWindowControllerCommon::CreateContainers() {
+wm::WorkspaceWindowState WmRootWindowController::GetWorkspaceWindowState() {
+  return workspace_controller_ ? workspace_controller()->GetWindowState()
+                               : wm::WORKSPACE_WINDOW_STATE_DEFAULT;
+}
+
+void WmRootWindowController::AddObserver(
+    WmRootWindowControllerObserver* observer) {
+  observers_.AddObserver(observer);
+}
+
+void WmRootWindowController::RemoveObserver(
+    WmRootWindowControllerObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+void WmRootWindowController::CreateContainers() {
   // These containers are just used by PowerButtonController to animate groups
   // of containers simultaneously without messing up the current transformations
   // on those containers. These are direct children of the root window; all of
   // the other containers are their children.
 
   // The wallpaper container is not part of the lock animation, so it is not
   // included in those animate groups. When the screen is locked, the wallpaper
   // is moved to the lock screen wallpaper container (and moved back on unlock).
   // Ensure that there's an opaque layer occluding the non-lock-screen layers.
   WmWindow* wallpaper_container = CreateContainer(
@@ skipping 157 matching lines @@
   WmWindow* mouse_cursor_container = CreateContainer(
       kShellWindowId_MouseCursorContainer, "MouseCursorContainer", root_);
   mouse_cursor_container->SetBoundsInScreenBehaviorForChildren(
       WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
 #endif
 
   CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
                   "PowerButtonAnimationContainer", root_);
 }
 
-void RootWindowControllerCommon::CreateLayoutManagers() {
-  root_window_layout_ = new wm::RootWindowLayoutManager(root_);
-  root_->SetLayoutManager(base::WrapUnique(root_window_layout_));
+void WmRootWindowController::CreateLayoutManagers() {
+  root_window_layout_manager_ = new wm::RootWindowLayoutManager(root_);
+  root_->SetLayoutManager(base::WrapUnique(root_window_layout_manager_));
 
   WmWindow* default_container =
       root_->GetChildByShellWindowId(kShellWindowId_DefaultContainer);
   workspace_controller_.reset(new WorkspaceController(default_container));
 }
 
-void RootWindowControllerCommon::DeleteWorkspaceController() {
+void WmRootWindowController::DeleteWorkspaceController() {
   workspace_controller_.reset();
 }
 
 }  // namespace ash