[mus+ash] Removes WmWindow from screen_dimmer and video_detector

ash/high_contrast/high_contrast_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/high_contrast/high_contrast_controller.h"
 
 #include "ash/shell.h"
 #include "ash/wm_window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
@@ skipping 16 matching lines @@
   for (aura::Window::Windows::iterator it = root_window_list.begin();
        it != root_window_list.end(); it++) {
     UpdateDisplay(*it);
   }
 }
 
 void HighContrastController::UpdateDisplay(aura::Window* root_window) {
   root_window->layer()->SetLayerInverted(enabled_);
 }
 
-void HighContrastController::OnRootWindowAdded(WmWindow* root_window) {
-  UpdateDisplay(WmWindow::GetAuraWindow(root_window));
+void HighContrastController::OnRootWindowAdded(aura::Window* root_window) {
+  UpdateDisplay(root_window);
 }
 
 }  // namespace ash