[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/shelf/shelf.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_H_
 #define ASH_SHELF_SHELF_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 18 matching lines @@
 
 enum class AnimationChangeType;
 class ShelfBezelEventHandler;
 class ShelfLayoutManager;
 class ShelfLayoutManagerTest;
 class ShelfLockingManager;
 class ShelfView;
 class ShelfWidget;
 class StatusAreaWidget;
 class ShelfObserver;
-class WmWindow;
 
 // Controller for the shelf state. One per display, because each display might
 // have different shelf alignment, autohide, etc. Exists for the lifetime of the
 // root window controller.
 class ASH_EXPORT Shelf : public ShelfLayoutManagerObserver {
  public:
   Shelf();
   ~Shelf() override;
 
   // Returns the shelf for the display that |window| is on. Note that the shelf
   // widget may not exist, or the shelf may not be visible.
   static Shelf* ForWindow(aura::Window* window);
 
   // Returns if shelf alignment options are enabled, and the user is able to
   // adjust the alignment (eg. not allowed in guest and supervised user modes).
   static bool CanChangeShelfAlignment();
 
-  void CreateShelfWidget(WmWindow* root);
+  void CreateShelfWidget(aura::Window* root);
   void ShutdownShelfWidget();
   void DestroyShelfWidget();
 
   ShelfLayoutManager* shelf_layout_manager() const {
     return shelf_layout_manager_;
   }
 
   ShelfWidget* shelf_widget() { return shelf_widget_.get(); }
 
   // TODO(jamescook): Eliminate this method.
   void NotifyShelfInitialized();
 
   // Returns the window showing the shelf.
-  WmWindow* GetWindow();
+  aura::Window* GetWindow();
 
   ShelfAlignment alignment() const { return alignment_; }
   void SetAlignment(ShelfAlignment alignment);
 
   // Returns true if the shelf alignment is horizontal (i.e. at the bottom).
   bool IsHorizontalAlignment() const;
 
   // Returns a value based on shelf alignment.
   int SelectValueForShelfAlignment(int bottom, int left, int right) const;
 
@@ skipping 17 matching lines @@
 
   ShelfVisibilityState GetVisibilityState() const;
 
   // Returns the ideal bounds of the shelf assuming it is visible.
   gfx::Rect GetIdealBounds();
 
   gfx::Rect GetUserWorkAreaBounds() const;
 
   // 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 UpdateIconPositionForPanel(WmWindow* window);
+  void UpdateIconPositionForPanel(aura::Window* window);
 
   // 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(WmWindow* window);
+  gfx::Rect GetScreenBoundsOfItemIconForWindow(aura::Window* window);
 
   // Launch a 0-indexed shelf item in the shelf. A negative index launches the
   // last shelf item in the shelf.
   static void LaunchShelfItem(int item_index);
 
   // Activates the shelf item specified by the index in the list of shelf items.
   static void ActivateShelfItem(int item_index);
 
   // Handles a gesture |event| coming from a source outside the shelf widget
   // (e.g. the status area widget). Allows support for behaviors like toggling
@@ skipping 45 matching lines @@
   // Forwards touch gestures on a bezel sensor to the shelf.
   // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647
   std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_H_