[mus+ash] Removes WmWindow from screen_dimmer and video_detector

ash/wallpaper/wallpaper_controller.cc

 // 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.
 
 #include "ash/wallpaper/wallpaper_controller.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/ash_switches.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wallpaper/wallpaper_controller_observer.h"
 #include "ash/wallpaper/wallpaper_delegate.h"
 #include "ash/wallpaper/wallpaper_view.h"
 #include "ash/wallpaper/wallpaper_widget_controller.h"
-#include "ash/wm_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/task_runner.h"
 #include "components/wallpaper/wallpaper_color_calculator.h"
 #include "components/wallpaper/wallpaper_resizer.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/views/widget/widget.h"
@@ skipping 148 matching lines @@
       timer_.Stop();
       GetInternalDisplayCompositorLock();
       timer_.Start(FROM_HERE,
                    base::TimeDelta::FromMilliseconds(wallpaper_reload_delay_),
                    base::Bind(&WallpaperController::UpdateWallpaper,
                               base::Unretained(this), false /* clear cache */));
     }
   }
 }
 
-void WallpaperController::OnRootWindowAdded(WmWindow* root_window) {
+void WallpaperController::OnRootWindowAdded(aura::Window* root_window) {
   // The wallpaper hasn't been set yet.
   if (wallpaper_mode_ == WALLPAPER_NONE)
     return;
 
   // Handle resolution change for "built-in" images.
   gfx::Size max_display_size = GetMaxDisplaySizeInNative();
   if (current_max_display_size_ != max_display_size) {
     current_max_display_size_ = max_display_size;
     if (wallpaper_mode_ == WALLPAPER_IMAGE && current_wallpaper_)
       UpdateWallpaper(true /* clear cache */);
@@ skipping 83 matching lines @@
   CalculateWallpaperColors();
   compositor_lock_.reset();
 }
 
 void WallpaperController::OnColorCalculationComplete() {
   const SkColor color = color_calculator_->prominent_color();
   color_calculator_.reset();
   SetProminentColor(color);
 }
 
-void WallpaperController::InstallDesktopController(WmWindow* root_window) {
+void WallpaperController::InstallDesktopController(aura::Window* root_window) {
   WallpaperWidgetController* component = nullptr;
   int container_id = GetWallpaperContainerId(locked_);
 
   switch (wallpaper_mode_) {
     case WALLPAPER_IMAGE: {
       component = new WallpaperWidgetController(
           CreateWallpaper(root_window, container_id));
       break;
     }
     case WALLPAPER_NONE:
       NOTREACHED();
       return;
   }
 
-  RootWindowController* controller = root_window->GetRootWindowController();
+  RootWindowController* controller =
+      RootWindowController::ForWindow(root_window);
   controller->SetAnimatingWallpaperWidgetController(
       new AnimatingWallpaperWidgetController(component));
   component->StartAnimating(controller);
 }
 
 void WallpaperController::InstallDesktopControllerForAllWindows() {
-  for (WmWindow* root : ShellPort::Get()->GetAllRootWindows())
+  for (aura::Window* root : Shell::GetAllRootWindows())
     InstallDesktopController(root);
   current_max_display_size_ = GetMaxDisplaySizeInNative();
 }
 
 bool WallpaperController::ReparentWallpaper(int container) {
   bool moved = false;
-  for (WmWindow* root_window : ShellPort::Get()->GetAllRootWindows()) {
-    RootWindowController* root_window_controller =
-        root_window->GetRootWindowController();
+  for (auto* root_window_controller : Shell::GetAllRootWindowControllers()) {
     // In the steady state (no animation playing) the wallpaper widget
     // controller exists in the RootWindowController.
     WallpaperWidgetController* wallpaper_widget_controller =
         root_window_controller->wallpaper_widget_controller();
     if (wallpaper_widget_controller) {
       moved |= wallpaper_widget_controller->Reparent(
           root_window_controller->GetWindow(), container);
     }
     // During wallpaper show animations the controller lives in
     // AnimatingWallpaperWidgetController owned by RootWindowController.
@@ skipping 90 matching lines @@
               base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
     }
   }
 }
 
 void WallpaperController::CompositorLockTimedOut() {
   compositor_lock_.reset();
 }
 
 }  // namespace ash