[mus+ash] Removes WmWindow from screen_dimmer and video_detector

ash/wallpaper/wallpaper_controller.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_WALLPAPER_WALLPAPER_CONTROLLER_H_
 #define ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 76 matching lines @@
   // asynchronously. If loading a real wallpaper, there are cases that these
   // tests crash because the required widget is not ready. This function
   // synchronously creates an empty widget for those tests to prevent
   // crashes. An example test is SystemGestureEventFilterTest.ThreeFingerSwipe.
   void CreateEmptyWallpaper();
 
   // WmDisplayObserver:
   void OnDisplayConfigurationChanged() override;
 
   // ShellObserver:
-  void OnRootWindowAdded(WmWindow* root_window) override;
+  void OnRootWindowAdded(aura::Window* root_window) override;
 
   // SessionObserver:
   void OnSessionStateChanged(session_manager::SessionState state) override;
 
   // Returns the maximum size of all displays combined in native
   // resolutions.  Note that this isn't the bounds of the display who
   // has maximum resolutions. Instead, this returns the size of the
   // maximum width of all displays, and the maximum height of all displays.
   static gfx::Size GetMaxDisplaySizeInNative();
 
@@ skipping 22 matching lines @@
   // WallpaperColorCalculatorObserver:
   void OnColorCalculationComplete() override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(WallpaperControllerTest, BasicReparenting);
   FRIEND_TEST_ALL_PREFIXES(WallpaperControllerTest,
                            WallpaperMovementDuringUnlock);
   friend class WallpaperControllerTest;
 
   // Creates a WallpaperWidgetController for |root_window|.
-  void InstallDesktopController(WmWindow* root_window);
+  void InstallDesktopController(aura::Window* root_window);
 
   // Creates a WallpaperWidgetController for all root windows.
   void InstallDesktopControllerForAllWindows();
 
   // Moves the wallpaper to the specified container across all root windows.
   // Returns true if a wallpaper moved.
   bool ReparentWallpaper(int container);
 
   // Returns the wallpaper container id for unlocked and locked states.
   int GetWallpaperContainerId(bool locked);
@@ skipping 62 matching lines @@
   ScopedSessionObserver scoped_session_observer_;
 
   std::unique_ptr<ui::CompositorLock> compositor_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_