Converts MruWindowTracker to work with common types

ash/focus_cycler.cc

 // Copyright (c) 2012 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/focus_cycler.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/activation_client.h"
@@ skipping 63 matching lines @@
     // Ensure that we don't loop more than once.
     if (index == start_index)
       break;
 
     if (index == browser_index) {
       // Activate the most recently active browser window.
       MruWindowTracker::WindowList mru_windows(
           Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
       if (mru_windows.empty())
         break;
-      aura::Window* window = mru_windows.front();
-      wm::GetWindowState(window)->Activate();
-      views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
+      WmWindow* window = mru_windows.front();
+      window->GetWindowState()->Activate();
+      views::Widget* widget = views::Widget::GetWidgetForNativeWindow(
+          WmWindowAura::GetAuraWindow(window));
       if (!widget)
         break;
       views::FocusManager* focus_manager = widget->GetFocusManager();
       focus_manager->ClearFocus();
       focus_manager->RotatePaneFocus(
           direction == BACKWARD ?
               views::FocusManager::kBackward : views::FocusManager::kForward,
           views::FocusManager::kWrap);
       break;
     } else {
       if (FocusWidget(widgets_[index]))
         break;
     }
   }
 }
 
 bool FocusCycler::FocusWidget(views::Widget* widget) {
   // Note: It is not necessary to set the focus directly to the pane since that
   // will be taken care of by the widget activation.
   widget_activating_ = widget;
   widget->Activate();
   widget_activating_ = NULL;
   return widget->IsActive();
 }
 
 }  // namespace ash