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

ash/wm/panels/panel_frame_view.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_WM_PANELS_PANEL_FRAME_VIEW_H_
 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 23 matching lines @@
   // Sets the active and inactive frame colors. Note the inactive frame color
   // will have some transparency added when the frame is drawn.
   void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
 
   // views::View:
   const char* GetClassName() const override;
 
  private:
   void InitHeaderPainter();
 
-  WmWindow* GetWidgetWindow();
+  aura::Window* GetWidgetWindow();
 
   // Height from top of window to top of client area.
   int NonClientTopBorderHeight() const;
 
   // views::NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
   int NonClientHitTest(const gfx::Point& point) override;
   void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
@@ skipping 19 matching lines @@
   gfx::Rect client_view_bounds_;
 
   // Helper class for painting the header.
   std::unique_ptr<DefaultHeaderPainter> header_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelFrameView);
 };
 }
 
 #endif  // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_