Converts MruWindowTracker to work with common types

ash/shelf/shelf_layout_manager.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/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 1026 matching lines @@
       shelf_widget_->shelf()->IsShowingOverflowBubble())
     return SHELF_AUTO_HIDE_SHOWN;
 
   if (shelf_widget_->IsActive() ||
       (shelf_widget_->status_area_widget() &&
        shelf_widget_->status_area_widget()->IsActive()))
     return SHELF_AUTO_HIDE_SHOWN;
 
   // TODO(jamescook): Track visible windows on mash via ShelfDelegate.
   if (!Shell::GetInstance()->in_mus()) {
-    const std::vector<aura::Window*> windows =
+    const std::vector<WmWindow*> windows =
         shell->mru_window_tracker()->BuildWindowListIgnoreModal();
 
     // Process the window list and check if there are any visible windows.
     bool visible_window = false;
     for (size_t i = 0; i < windows.size(); ++i) {
       if (windows[i] && windows[i]->IsVisible() &&
-          !wm::GetWindowState(windows[i])->IsMinimized() &&
-          root_window_ == windows[i]->GetRootWindow()) {
+          !windows[i]->GetWindowState()->IsMinimized() &&
+          root_window_ ==
+              WmWindowAura::GetAuraWindow(windows[i]->GetRootWindow())) {
         visible_window = true;
         break;
       }
     }
     // If there are no visible windows do not hide the shelf.
     if (!visible_window)
       return SHELF_AUTO_HIDE_SHOWN;
   }
 
   if (gesture_drag_status_ == GESTURE_DRAG_COMPLETE_IN_PROGRESS)
@@ skipping 126 matching lines @@
   UpdateBoundsAndOpacity(target_bounds, true, NULL);
   UpdateVisibilityState();
 }
 
 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() {
   UpdateVisibilityState();
   LayoutShelf();
 }
 
 }  // namespace ash