[mus+ash] Removes WmWindow from screen_dimmer and video_detector

ash/wm/video_detector.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/wm/video_detector.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm_window.h"
@@ skipping 129 matching lines @@
   window_observer_manager_.Remove(window);
 }
 
 void VideoDetector::OnChromeTerminating() {
   // Stop checking video activity once the shutdown
   // process starts. crbug.com/231696.
   is_shutting_down_ = true;
 }
 
 void VideoDetector::OnFullscreenStateChanged(bool is_fullscreen,
-                                             WmWindow* root_window) {
-  aura::Window* aura_window = root_window->aura_window();
-  if (is_fullscreen && !fullscreen_root_windows_.count(aura_window)) {
-    fullscreen_root_windows_.insert(aura_window);
-    if (!window_observer_manager_.IsObserving(aura_window))
-      window_observer_manager_.Add(aura_window);
+                                             aura::Window* root_window) {
+  if (is_fullscreen && !fullscreen_root_windows_.count(root_window)) {
+    fullscreen_root_windows_.insert(root_window);
+    if (!window_observer_manager_.IsObserving(root_window))
+      window_observer_manager_.Add(root_window);
     UpdateState();
-  } else if (!is_fullscreen && fullscreen_root_windows_.count(aura_window)) {
-    fullscreen_root_windows_.erase(aura_window);
-    window_observer_manager_.Remove(aura_window);
+  } else if (!is_fullscreen && fullscreen_root_windows_.count(root_window)) {
+    fullscreen_root_windows_.erase(root_window);
+    window_observer_manager_.Remove(root_window);
     UpdateState();
   }
 }
 
 void VideoDetector::HandleVideoActivity(aura::Window* window,
                                         base::TimeTicks now) {
   if (!window->IsVisible())
     return;
 
   gfx::Rect root_bounds = window->GetRootWindow()->bounds();
@@ skipping 20 matching lines @@
   }
 
   if (state_ != new_state) {
     state_ = new_state;
     for (auto& observer : observers_)
       observer.OnVideoStateChanged(state_);
   }
 }
 
 }  // namespace ash