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

ash/shelf/shelf.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_H_
 #define ASH_SHELF_SHELF_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace app_list {
 class ApplicationDragAndDropHost;
 }
 
-namespace aura {
-class Window;
-}
-
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class View;
 }
 
 namespace ash {
 class AppListButton;
@@ skipping 20 matching lines @@
   ~Shelf();
 
   // Return the shelf for the primary display. NULL if no user is logged in yet.
   // Useful for tests. For production code use ForWindow() because the user may
   // have multiple displays.
   static Shelf* ForPrimaryDisplay();
 
   // Return the shelf for the display that |window| is currently on, or a shelf
   // on primary display if the shelf per display feature is disabled. NULL if no
   // user is logged in yet.
-  static Shelf* ForWindow(const aura::Window* window);
+  static Shelf* ForWindow(const WmWindow* window);
 
   void SetAlignment(ShelfAlignment alignment);
   ShelfAlignment alignment() const { return alignment_; }
 
   // Sets the ShelfAutoHideBehavior. See enum description for details.
   void SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior);
   ShelfAutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
   }
 
   ShelfAutoHideState GetAutoHideState() const;
 
   ShelfVisibilityState GetVisibilityState() const;
 
   // Returns the screen bounds of the item for the specified window. If there is
   // no item for the specified window an empty rect is returned.
-  gfx::Rect GetScreenBoundsOfItemIconForWindow(const aura::Window* window);
+  gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
 
   // Updates the icon position given the current window bounds. This is used
   // when dragging panels to reposition them with respect to the other panels.
-  void UpdateIconPositionForWindow(aura::Window* window);
+  void UpdateIconPositionForWindow(WmWindow* window);
 
   // Activates the the shelf item specified by the index in the list of shelf
   // items.
   void ActivateShelfItem(int index);
 
   // Cycles the window focus linearly over the current shelf items.
   void CycleWindowLinear(CycleDirection direction);
 
   void AddIconObserver(ShelfIconObserver* observer);
   void RemoveIconObserver(ShelfIconObserver* observer);
@@ skipping 49 matching lines @@
 
   ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM;
   ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_H_