[mus+ash] Removes WmWindow from screen_dimmer and video_detector

ash/wm/workspace/workspace_layout_manager.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/workspace/workspace_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/keyboard/keyboard_observer_register.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 286 matching lines @@
       ScreenUtil::GetDisplayWorkAreaBoundsInParent(window_));
   if (work_area != work_area_in_parent_) {
     const wm::WMEvent event(wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
     AdjustAllWindowsBoundsForWorkAreaChange(&event);
   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, ShellObserver implementation:
 
-void WorkspaceLayoutManager::OnFullscreenStateChanged(bool is_fullscreen,
-                                                      WmWindow* root_window) {
-  if (root_window->aura_window() != root_window_ ||
-      is_fullscreen_ == is_fullscreen) {
+void WorkspaceLayoutManager::OnFullscreenStateChanged(
+    bool is_fullscreen,
+    aura::Window* root_window) {
+  if (root_window != root_window_ || is_fullscreen_ == is_fullscreen)
     return;
-  }
 
   is_fullscreen_ = is_fullscreen;
   if (Shell::Get()->screen_pinning_controller()->IsPinned()) {
     // If this is in pinned mode, then this event does not trigger the
     // always-on-top state change, because it is kept disabled regardless of
     // the fullscreen state change.
     return;
   }
 
   UpdateAlwaysOnTop(is_fullscreen_ ? wm::GetWindowForFullscreenMode(window_)
@@ skipping 53 matching lines @@
 void WorkspaceLayoutManager::UpdateFullscreenState() {
   // TODO(flackr): The fullscreen state is currently tracked per workspace
   // but the shell notification implies a per root window state. Currently
   // only windows in the default workspace container will go fullscreen but
   // this should really be tracked by the RootWindowController since
   // technically any container could get a fullscreen window.
   if (window_->id() != kShellWindowId_DefaultContainer)
     return;
   bool is_fullscreen = wm::GetWindowForFullscreenMode(window_) != nullptr;
   if (is_fullscreen != is_fullscreen_) {
-    Shell::Get()->NotifyFullscreenStateChanged(is_fullscreen,
-                                               WmWindow::Get(root_window_));
+    Shell::Get()->NotifyFullscreenStateChanged(is_fullscreen, root_window_);
     is_fullscreen_ = is_fullscreen;
   }
 }
 
 void WorkspaceLayoutManager::UpdateAlwaysOnTop(aura::Window* window_on_top) {
   // Changing always on top state may change window's parent. Iterate on a copy
   // of |windows_| to avoid invalidating an iterator. Since both workspace and
   // always_on_top containers' layouts are managed by this class all the
   // appropriate windows will be included in the iteration.
   WindowSet windows(windows_);
   for (aura::Window* window : windows) {
     wm::WindowState* window_state = wm::GetWindowState(window);
     if (window_on_top)
       window_state->DisableAlwaysOnTop(window_on_top);
     else
       window_state->RestoreAlwaysOnTop();
   }
 }
 
 }  // namespace ash