Converts MruWindowTracker to work with common types

ash/aura/wm_shell_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_shell_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/common/wm_overview_mode_observer.h"
@@ skipping 11 matching lines @@
 
 namespace ash {
 
 WmShellAura::WmShellAura() {
   WmShell::Set(this);
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 WmShellAura::~WmShellAura() {
   WmShell::Set(nullptr);
-  if (added_activation_observer_) {
-    aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())
-        ->RemoveObserver(this);
-  }
+
+  if (added_activation_observer_)
+    Shell::GetInstance()->activation_client()->RemoveObserver(this);
+
   if (added_display_observer_)
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 WmWindow* WmShellAura::NewContainerWindow() {
   aura::Window* aura_window = new aura::Window(nullptr);
   aura_window->Init(ui::LAYER_NOT_DRAWN);
   return WmWindowAura::Get(aura_window);
@@ skipping 17 matching lines @@
   return WmWindowAura::Get(Shell::GetInstance()
                                ->window_tree_host_manager()
                                ->GetRootWindowForDisplayId(display_id));
 }
 
 WmWindow* WmShellAura::GetRootWindowForNewWindows() {
   return WmWindowAura::Get(Shell::GetTargetRootWindow());
 }
 
 std::vector<WmWindow*> WmShellAura::GetMruWindowList() {
-  return WmWindowAura::FromAuraWindows(
-      Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
+  // TODO(sky): remove this and provide accessor for MruWindowTracker.
+  // http://crbug.com/617789.
+  return Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
 }
 
 std::vector<WmWindow*> WmShellAura::GetMruWindowListIgnoreModals() {
-  return WmWindowAura::FromAuraWindows(
-      Shell::GetInstance()->mru_window_tracker()->BuildWindowListIgnoreModal());
+  // TODO(sky): remove this and provide accessor for MruWindowTracker.
+  // http://crbug.com/617789.
+  return Shell::GetInstance()
+      ->mru_window_tracker()
+      ->BuildWindowListIgnoreModal();
 }
 
 bool WmShellAura::IsForceMaximizeOnFirstRun() {
   return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();
 }
 
 bool WmShellAura::IsUserSessionBlocked() {
   return Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked();
 }
 
 bool WmShellAura::IsScreenLocked() {
   return Shell::GetInstance()->session_state_delegate()->IsScreenLocked();
 }
 
+bool WmShellAura::CanShowWindowForUser(WmWindow* window) {
+  return Shell::GetInstance()->delegate()->CanShowWindowForUser(
+      WmWindowAura::GetAuraWindow(window));
+}
+
 void WmShellAura::LockCursor() {
   Shell::GetInstance()->cursor_manager()->LockCursor();
 }
 
 void WmShellAura::UnlockCursor() {
   Shell::GetInstance()->cursor_manager()->UnlockCursor();
 }
 
 std::vector<WmWindow*> WmShellAura::GetAllRootWindows() {
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
@@ skipping 24 matching lines @@
 bool WmShellAura::IsOverviewModeRestoringMinimizedWindows() {
   WindowSelectorController* window_selector_controller =
       Shell::GetInstance()->window_selector_controller();
   return window_selector_controller &&
          window_selector_controller->IsRestoringMinimizedWindows();
 }
 
 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) {
   if (!added_activation_observer_) {
     added_activation_observer_ = true;
-    aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())
-        ->AddObserver(this);
+    Shell::GetInstance()->activation_client()->AddObserver(this);
   }
   activation_observers_.AddObserver(observer);
 }
 
 void WmShellAura::RemoveActivationObserver(WmActivationObserver* observer) {
   activation_observers_.RemoveObserver(observer);
 }
 
 void WmShellAura::AddDisplayObserver(WmDisplayObserver* observer) {
   if (!added_display_observer_) {
@@ skipping 41 matching lines @@
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
 void WmShellAura::OnOverviewModeEnded() {
   FOR_EACH_OBSERVER(WmOverviewModeObserver, overview_mode_observers_,
                     OnOverviewModeEnded());
 }
 
 }  // namespace ash