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

ash/shell.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_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 157 matching lines @@
 class VideoActivityNotifier;
 class VideoDetector;
 class VpnList;
 class WallpaperController;
 class WallpaperDelegate;
 class WebNotificationTray;
 class WindowCycleController;
 class WindowPositioner;
 class WindowSelectorController;
 class WindowTreeHostManager;
-class WmWindow;
 
 enum class Config;
 enum class LoginStatus;
 
 namespace shell {
 class WindowWatcher;
 }
 
 namespace test {
 class ShellTestApi;
@@ skipping 403 matching lines @@
   // Notifies observers that |pinned_window| changed its pinned window state.
   void NotifyPinnedStateChanged(aura::Window* pinned_window);
 
   // Notifies observers that the virtual keyboard has been
   // activated/deactivated for |root_window|.
   void NotifyVirtualKeyboardActivated(bool activated,
                                       aura::Window* root_window);
 
   // Notifies observers that the shelf was created for |root_window|.
   // TODO(jamescook): Move to Shelf.
-  void NotifyShelfCreatedForRootWindow(WmWindow* root_window);
+  void NotifyShelfCreatedForRootWindow(aura::Window* root_window);
 
   // Notifies observers that |root_window|'s shelf changed alignment.
   // TODO(jamescook): Move to Shelf.
-  void NotifyShelfAlignmentChanged(WmWindow* root_window);
+  void NotifyShelfAlignmentChanged(aura::Window* root_window);
 
   // Notifies observers that |root_window|'s shelf changed auto-hide behavior.
   // TODO(jamescook): Move to Shelf.
-  void NotifyShelfAutoHideBehaviorChanged(WmWindow* root_window);
+  void NotifyShelfAutoHideBehaviorChanged(aura::Window* root_window);
 
   // Used to provide better error messages for Shell::Get() under mash.
   static void SetIsBrowserProcessWithMash();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
   friend class AcceleratorControllerTest;
   friend class RootWindowController;
@@ skipping 214 matching lines @@
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_