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

ash/shelf/shelf_widget.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_WIDGET_H_
 #define ASH_SHELF_SHELF_WIDGET_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 10 matching lines @@
 }
 
 namespace ash {
 enum class AnimationChangeType;
 class AppListButton;
 class FocusCycler;
 class Shelf;
 class ShelfLayoutManager;
 class ShelfView;
 class StatusAreaWidget;
-class WmWindow;
 
 // The ShelfWidget manages the shelf view (which contains the shelf icons) and
 // the status area widget. There is one ShelfWidget per display. It is created
 // early during RootWindowController initialization.
 class ASH_EXPORT ShelfWidget : public views::Widget,
                                public views::WidgetObserver,
                                public ShelfBackgroundAnimatorObserver,
                                public ShelfLayoutManagerObserver {
  public:
-  ShelfWidget(WmWindow* shelf_container, Shelf* shelf);
+  ShelfWidget(aura::Window* shelf_container, Shelf* shelf);
   ~ShelfWidget() override;
 
-  void CreateStatusAreaWidget(WmWindow* status_container);
+  void CreateStatusAreaWidget(aura::Window* status_container);
 
   void OnShelfAlignmentChanged();
 
   // Sets the shelf's background type.
   void SetPaintsBackground(ShelfBackgroundType background_type,
                            AnimationChangeType change_type);
   ShelfBackgroundType GetBackgroundType() const;
 
   // Hide the shelf behind a black bar during e.g. a user transition when |hide|
   // is true. The |animation_time_ms| will be used as animation duration.
@@ skipping 14 matching lines @@
   FocusCycler* GetFocusCycler();
 
   // Called by the activation delegate, before the shelf is activated
   // when no other windows are visible.
   void WillActivateAsFallback() { activating_as_fallback_ = true; }
 
   // Clean up prior to deletion.
   void Shutdown();
 
   // See Shelf::UpdateIconPositionForPanel().
-  void UpdateIconPositionForPanel(WmWindow* panel);
+  void UpdateIconPositionForPanel(aura::Window* panel);
 
   // See Shelf::GetScreenBoundsOfItemIconForWindow().
-  gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
+  gfx::Rect GetScreenBoundsOfItemIconForWindow(aura::Window* window);
 
   // Returns the button that opens the app launcher.
   AppListButton* GetAppListButton() const;
 
   // Returns the ApplicationDragAndDropHost for this shelf.
   app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
 
   // Overridden from views::WidgetObserver:
   void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
 
@@ skipping 25 matching lines @@
   ShelfView* const shelf_view_;
   ShelfBackgroundAnimator background_animator_;
   bool activating_as_fallback_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WIDGET_H_