mash: Migrate Shelf aura::Window uses to WmWindow.

ash/aura/wm_shelf_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_shelf_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/wm_window.h"
 #include "ash/shelf/dimmer_view.h"
@@ skipping 145 matching lines @@
 gfx::Rect WmShelfAura::GetIdealBounds() {
   return shelf_layout_manager_->GetIdealBounds();
 }
 
 gfx::Rect WmShelfAura::GetUserWorkAreaBounds() const {
   return shelf_layout_manager_ ? shelf_layout_manager_->user_work_area_bounds()
                                : gfx::Rect();
 }
 
 void WmShelfAura::UpdateIconPositionForWindow(WmWindow* window) {
-  shelf_->UpdateIconPositionForWindow(WmWindowAura::GetAuraWindow(window));
+  shelf_->UpdateIconPositionForWindow(window);
 }
 
 gfx::Rect WmShelfAura::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
-  return shelf_->GetScreenBoundsOfItemIconForWindow(
-      WmWindowAura::GetAuraWindow(window));
+  return shelf_->GetScreenBoundsOfItemIconForWindow(window);
 }
 
 bool WmShelfAura::ProcessGestureEvent(const ui::GestureEvent& event) {
   // Can be called at login screen.
   if (!shelf_layout_manager_)
     return false;
   return shelf_layout_manager_->ProcessGestureEvent(event);
 }
 
 void WmShelfAura::AddObserver(WmShelfObserver* observer) {
@@ skipping 44 matching lines @@
 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnAutoHideStateChanged(new_state));
 }
 
 void WmShelfAura::OnShelfIconPositionsChanged() {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
 }
 
 }  // namespace ash