Shuffles and renames ash/common/wm classes

ash/wm/aura/wm_globals_aura.cc

Index: ash/wm/aura/wm_globals_aura.cc
diff --git a/ash/wm/aura/wm_globals_aura.cc b/ash/wm/aura/wm_globals_aura.cc
deleted file mode 100644
index 2967a5fddc934e1e3a14214b3f392e333701205c..0000000000000000000000000000000000000000
--- a/ash/wm/aura/wm_globals_aura.cc
+++ /dev/null
@@ -1,203 +0,0 @@
-// 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/wm/aura/wm_globals_aura.h"
-
-#include "ash/common/wm/wm_activation_observer.h"
-#include "ash/common/wm/wm_display_observer.h"
-#include "ash/common/wm/wm_overview_mode_observer.h"
-#include "ash/display/window_tree_host_manager.h"
-#include "ash/session/session_state_delegate.h"
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
-#include "ash/wm/aura/wm_window_aura.h"
-#include "ash/wm/drag_window_resizer.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/window_util.h"
-#include "base/memory/ptr_util.h"
-#include "ui/aura/client/focus_client.h"
-#include "ui/wm/public/activation_client.h"
-
-namespace ash {
-namespace wm {
-
-WmGlobalsAura::WmGlobalsAura() {
-  WmGlobals::Set(this);
-  Shell::GetInstance()->AddShellObserver(this);
-}
-
-WmGlobalsAura::~WmGlobalsAura() {
-  WmGlobals::Set(nullptr);
-  if (added_activation_observer_) {
-    aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())
-        ->RemoveObserver(this);
-  }
-  if (added_display_observer_)
-    Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
-
-  Shell::GetInstance()->RemoveShellObserver(this);
-}
-
-WmWindow* WmGlobalsAura::NewContainerWindow() {
-  aura::Window* aura_window = new aura::Window(nullptr);
-  aura_window->Init(ui::LAYER_NOT_DRAWN);
-  return WmWindowAura::Get(aura_window);
-}
-
-WmWindow* WmGlobalsAura::GetFocusedWindow() {
-  return WmWindowAura::Get(
-      aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
-          ->GetFocusedWindow());
-}
-
-WmWindow* WmGlobalsAura::GetActiveWindow() {
-  return WmWindowAura::Get(wm::GetActiveWindow());
-}
-
-WmWindow* WmGlobalsAura::GetPrimaryRootWindow() {
-  return WmWindowAura::Get(Shell::GetPrimaryRootWindow());
-}
-
-WmWindow* WmGlobalsAura::GetRootWindowForDisplayId(int64_t display_id) {
-  return WmWindowAura::Get(Shell::GetInstance()
-                               ->window_tree_host_manager()
-                               ->GetRootWindowForDisplayId(display_id));
-}
-
-WmWindow* WmGlobalsAura::GetRootWindowForNewWindows() {
-  return WmWindowAura::Get(Shell::GetTargetRootWindow());
-}
-
-std::vector<WmWindow*> WmGlobalsAura::GetMruWindowList() {
-  return WmWindowAura::FromAuraWindows(
-      Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
-}
-
-std::vector<WmWindow*> WmGlobalsAura::GetMruWindowListIgnoreModals() {
-  return WmWindowAura::FromAuraWindows(
-      Shell::GetInstance()->mru_window_tracker()->BuildWindowListIgnoreModal());
-}
-
-bool WmGlobalsAura::IsForceMaximizeOnFirstRun() {
-  return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();
-}
-
-bool WmGlobalsAura::IsUserSessionBlocked() {
-  return Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked();
-}
-
-bool WmGlobalsAura::IsScreenLocked() {
-  return Shell::GetInstance()->session_state_delegate()->IsScreenLocked();
-}
-
-void WmGlobalsAura::LockCursor() {
-  Shell::GetInstance()->cursor_manager()->LockCursor();
-}
-
-void WmGlobalsAura::UnlockCursor() {
-  Shell::GetInstance()->cursor_manager()->UnlockCursor();
-}
-
-std::vector<WmWindow*> WmGlobalsAura::GetAllRootWindows() {
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  std::vector<WmWindow*> wm_windows(root_windows.size());
-  for (size_t i = 0; i < root_windows.size(); ++i)
-    wm_windows[i] = WmWindowAura::Get(root_windows[i]);
-  return wm_windows;
-}
-
-void WmGlobalsAura::RecordUserMetricsAction(WmUserMetricsAction action) {
-  return Shell::GetInstance()->metrics()->RecordUserMetricsAction(action);
-}
-
-std::unique_ptr<WindowResizer> WmGlobalsAura::CreateDragWindowResizer(
-    std::unique_ptr<WindowResizer> next_window_resizer,
-    wm::WindowState* window_state) {
-  return base::WrapUnique(
-      DragWindowResizer::Create(next_window_resizer.release(), window_state));
-}
-
-bool WmGlobalsAura::IsOverviewModeSelecting() {
-  WindowSelectorController* window_selector_controller =
-      Shell::GetInstance()->window_selector_controller();
-  return window_selector_controller &&
-         window_selector_controller->IsSelecting();
-}
-
-bool WmGlobalsAura::IsOverviewModeRestoringMinimizedWindows() {
-  WindowSelectorController* window_selector_controller =
-      Shell::GetInstance()->window_selector_controller();
-  return window_selector_controller &&
-         window_selector_controller->IsRestoringMinimizedWindows();
-}
-
-void WmGlobalsAura::AddActivationObserver(WmActivationObserver* observer) {
-  if (!added_activation_observer_) {
-    added_activation_observer_ = true;
-    aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())
-        ->AddObserver(this);
-  }
-  activation_observers_.AddObserver(observer);
-}
-
-void WmGlobalsAura::RemoveActivationObserver(WmActivationObserver* observer) {
-  activation_observers_.RemoveObserver(observer);
-}
-
-void WmGlobalsAura::AddDisplayObserver(WmDisplayObserver* observer) {
-  if (!added_display_observer_) {
-    added_display_observer_ = true;
-    Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
-  }
-  display_observers_.AddObserver(observer);
-}
-
-void WmGlobalsAura::RemoveDisplayObserver(WmDisplayObserver* observer) {
-  display_observers_.RemoveObserver(observer);
-}
-
-void WmGlobalsAura::AddOverviewModeObserver(WmOverviewModeObserver* observer) {
-  overview_mode_observers_.AddObserver(observer);
-}
-
-void WmGlobalsAura::RemoveOverviewModeObserver(
-    WmOverviewModeObserver* observer) {
-  overview_mode_observers_.RemoveObserver(observer);
-}
-
-void WmGlobalsAura::OnWindowActivated(
-    aura::client::ActivationChangeObserver::ActivationReason reason,
-    aura::Window* gained_active,
-    aura::Window* lost_active) {
-  FOR_EACH_OBSERVER(WmActivationObserver, activation_observers_,
-                    OnWindowActivated(WmWindowAura::Get(gained_active),
-                                      WmWindowAura::Get(lost_active)));
-}
-
-void WmGlobalsAura::OnAttemptToReactivateWindow(aura::Window* request_active,
-                                                aura::Window* actual_active) {
-  FOR_EACH_OBSERVER(
-      WmActivationObserver, activation_observers_,
-      OnAttemptToReactivateWindow(WmWindowAura::Get(request_active),
-                                  WmWindowAura::Get(actual_active)));
-}
-
-void WmGlobalsAura::OnDisplayConfigurationChanging() {
-  FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
-                    OnDisplayConfigurationChanging());
-}
-
-void WmGlobalsAura::OnDisplayConfigurationChanged() {
-  FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
-                    OnDisplayConfigurationChanged());
-}
-
-void WmGlobalsAura::OnOverviewModeEnded() {
-  FOR_EACH_OBSERVER(WmOverviewModeObserver, overview_mode_observers_,
-                    OnOverviewModeEnded());
-}
-
-}  // namespace wm
-}  // namespace ash