mash: Remove some WmWindow usage in ash/shelf.

ash/shelf/shelf_layout_manager.h

 // Copyright 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.
 
 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 82 matching lines @@
   ShelfVisibilityState CalculateShelfVisibility();
 
   // Updates the visibility state.
   void UpdateVisibilityState();
 
   // Invoked by the shelf when the auto-hide state may have changed.
   void UpdateAutoHideState();
 
   // Updates the auto-hide state for certain events.
   // TODO(mash): Add similar event handling support for mash.
-  void UpdateAutoHideForMouseEvent(ui::MouseEvent* event, WmWindow* target);
-  void UpdateAutoHideForGestureEvent(ui::GestureEvent* event, WmWindow* target);
+  void UpdateAutoHideForMouseEvent(ui::MouseEvent* event, aura::Window* target);
+  void UpdateAutoHideForGestureEvent(ui::GestureEvent* event,
+                                     aura::Window* target);
 
   ShelfVisibilityState visibility_state() const {
     return state_.visibility_state;
   }
   ShelfAutoHideState auto_hide_state() const { return state_.auto_hide_state; }
 
   ShelfWidget* shelf_widget() { return shelf_widget_; }
 
   // Sets whether any windows overlap the shelf. If a window overlaps the shelf
   // the shelf renders slightly differently.
@@ skipping 148 matching lines @@
 
   // Returns true if at least one window is visible.
   bool HasVisibleWindow() const;
 
   // Returns the AutoHideState. This value is determined from the shelf and
   // tray.
   ShelfAutoHideState CalculateAutoHideState(
       ShelfVisibilityState visibility_state) const;
 
   // Returns true if |window| is a descendant of the shelf.
-  bool IsShelfWindow(WmWindow* window);
+  bool IsShelfWindow(aura::Window* window);
 
   int GetWorkAreaInsets(const State& state, int size) const;
 
   // Called when the LoginUI changes from visible to invisible.
   void UpdateShelfVisibilityAfterLoginUIChange();
 
   // Compute |target_bounds| opacity based on gesture and shelf visibility.
   float ComputeTargetOpacity(const State& state);
 
   // Returns true if there is a fullscreen window open that causes the shelf
@@ skipping 80 matching lines @@
                  keyboard::KeyboardControllerObserver>
       keyboard_observer_;
   ScopedSessionObserver scoped_session_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_