Converts overview to use common ash types

ash/wm/aura/wm_globals_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/wm/aura/wm_globals_aura.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"
@@ skipping 32 matching lines @@
 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() {
-  const std::vector<aura::Window*> windows = ash::Shell::GetInstance()
-                                                 ->mru_window_tracker()
-                                                 ->BuildWindowListIgnoreModal();
-  std::vector<WmWindow*> wm_windows(windows.size());
-  for (size_t i = 0; i < windows.size(); ++i)
-    wm_windows[i] = WmWindowAura::Get(windows[i]);
-  return wm_windows;
+  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() {
-  ash::Shell::GetInstance()->cursor_manager()->LockCursor();
+  Shell::GetInstance()->cursor_manager()->LockCursor();
 }
 
 void WmGlobalsAura::UnlockCursor() {
-  ash::Shell::GetInstance()->cursor_manager()->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;
 }
 
@@ skipping 58 matching lines @@
 
 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