Make GetRootWindow() return a Window instead of a RootWindow.

ash/wm/mru_window_tracker.cc

 // Copyright 2013 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/mru_window_tracker.h"
 
 #include <algorithm>
 
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_cycle_list.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 
 namespace ash {
 
 namespace {
 
 // Adds the windows that can be cycled through for the specified window id to
 // |windows|.
-void AddTrackedWindows(aura::RootWindow* root,
-                     int container_id,
-                     MruWindowTracker::WindowList* windows) {
+void AddTrackedWindows(aura::Window* root,
+                       int container_id,
+                       MruWindowTracker::WindowList* windows) {
   aura::Window* container = Shell::GetContainer(root, container_id);
   const MruWindowTracker::WindowList& children(container->children());
   windows->insert(windows->end(), children.begin(), children.end());
 }
 
 // Returns true if |window| is a container whose windows can be cycled to.
 bool IsSwitchableContainer(aura::Window* window) {
   if (!window)
     return false;
   for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
@@ skipping 13 matching lines @@
 // Returns a list of windows ordered by their stacking order.
 // If |mru_windows| is passed, these windows are moved to the front of the list.
 // If |top_most_at_end|, the list is returned in descending (bottom-most / least
 // recently used) order.
 MruWindowTracker::WindowList BuildWindowListInternal(
     const std::list<aura::Window*>* mru_windows,
     bool top_most_at_end) {
   MruWindowTracker::WindowList windows;
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
-  aura::RootWindow* active_root = Shell::GetTargetRootWindow();
+  aura::Window* active_root = Shell::GetTargetRootWindow();
   for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     if (*iter == active_root)
       continue;
     for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i)
       AddTrackedWindows(*iter, kSwitchableWindowContainerIds[i], &windows);
   }
 
   // Add windows in the active root windows last so that the topmost window
   // in the active root window becomes the front of the list.
@@ skipping 116 matching lines @@
   if (!ignore_window_activations_)
     SetActiveWindow(gained_active);
 }
 
 void MruWindowTracker::OnWindowDestroying(aura::Window* window) {
   mru_windows_.remove(window);
   window->RemoveObserver(this);
 }
 
 }  // namespace ash