[mus+ash] Removes WmWindow from screen_dimmer and video_detector

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 267 matching lines @@
       views::Widget* widget);
 
   // Sets work area insets of the display containing |window|, pings observers.
   void SetDisplayWorkAreaInsets(aura::Window* window,
                                 const gfx::Insets& insets);
 
   // Called when a casting session is started or stopped.
   void OnCastingSessionStartedOrStopped(bool started);
 
   // Called when a root window is created.
-  void OnRootWindowAdded(WmWindow* root_window);
+  void OnRootWindowAdded(aura::Window* root_window);
 
   // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
   // exists.
   void CreateKeyboard();
 
   // Deactivates the virtual keyboard.
   void DeactivateKeyboard();
 
   // Test if MaximizeModeWindowManager is not enabled, and if
   // MaximizeModeController is not currently setting a display rotation. Or if
@@ skipping 280 matching lines @@
   void NotifyMaximizeModeEnded();
 
   // Notifies observers that overview mode is about to be started (before the
   // windows get re-arranged).
   void NotifyOverviewModeStarting();
 
   // Notifies observers that overview mode has ended.
   void NotifyOverviewModeEnded();
 
   // Notifies observers that fullscreen mode has changed for |root_window|.
-  void NotifyFullscreenStateChanged(bool is_fullscreen, WmWindow* root_window);
+  void NotifyFullscreenStateChanged(bool is_fullscreen,
+                                    aura::Window* root_window);
 
   // 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|.
@@ skipping 234 matching lines @@
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_