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

ash/wm/panels/panel_layout_manager.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_LAYOUT_MANAGER_H_
 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
 
 #include <list>
 #include <memory>
 
@@ skipping 78 matching lines @@
   void OnWindowAddedToLayout(aura::Window* child) override;
   void OnWillRemoveWindowFromLayout(aura::Window* child) override;
   void OnWindowRemovedFromLayout(aura::Window* child) override;
   void OnChildWindowVisibilityChanged(aura::Window* child,
                                       bool visible) override;
   void SetChildBounds(aura::Window* child,
                       const gfx::Rect& requested_bounds) override;
 
   // ShellObserver:
   void OnOverviewModeEnded() override;
-  void OnShelfAlignmentChanged(WmWindow* root_window) override;
+  void OnShelfAlignmentChanged(aura::Window* root_window) override;
   void OnVirtualKeyboardStateChanged(bool activated,
                                      aura::Window* root_window) override;
 
   // aura::WindowObserver
   void OnWindowPropertyChanged(aura::Window* window,
                                const void* key,
                                intptr_t old) override;
 
   // wm::WindowStateObserver:
   void OnPostWindowStateTypeChange(wm::WindowState* window_state,
@@ skipping 94 matching lines @@
       keyboard_observer_;
 
   base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_