Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..."

> Eliminate Shell::RootWindowList in favor of aura::Window::Windows.
> 
> This is necessary as part of my plan to rework RootWindow, specifically making it not be a subclass of Window. (It will eventually be renamed WindowEventDispatcher). Code that expected to get the RootWindow interface from this type can still call GetDispatcher() on members of the returned vector of Windows.
> 
> R=oshima@chromium.org
> http://crbug.com/308843
> 
> Review URL: https://codereview.chromium.org/64933002

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/59153004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233813 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 5 deletions

diff --git a/ash/high_contrast/high_contrast_controller.cc b/ash/high_contrast/high_contrast_controller.cc
index 72fe036..31a0dbb 100644
--- a/ash/high_contrast/high_contrast_controller.cc
+++ b/ash/high_contrast/high_contrast_controller.cc
@@ -18,8 +18,8 @@ void HighContrastController::SetEnabled(bool enabled) {
   enabled_ = enabled;
 
   // Update all active displays.
-  aura::Window::Windows root_window_list = Shell::GetAllRootWindows();
-  for (aura::Window::Windows::iterator it = root_window_list.begin();
+  Shell::RootWindowList root_window_list = Shell::GetAllRootWindows();
+  for (Shell::RootWindowList::iterator it = root_window_list.begin();
       it != root_window_list.end(); it++) {
     UpdateDisplay(*it);
   }
@@ -29,7 +29,7 @@ void HighContrastController::OnRootWindowAdded(aura::RootWindow* root_window) {
   UpdateDisplay(root_window);
 }
 
-void HighContrastController::UpdateDisplay(aura::Window* root_window) {
+void HighContrastController::UpdateDisplay(aura::RootWindow* root_window) {
   root_window->layer()->SetLayerInverted(enabled_);
 }
 
diff --git a/ash/high_contrast/high_contrast_controller.h b/ash/high_contrast/high_contrast_controller.h
index e42e46c..2afd60b 100644
--- a/ash/high_contrast/high_contrast_controller.h
+++ b/ash/high_contrast/high_contrast_controller.h
@@ -10,7 +10,6 @@
 
 namespace aura {
 class RootWindow;
-class Window;
 }
 
 namespace ash {
@@ -29,7 +28,7 @@ class ASH_EXPORT HighContrastController {
 
  private:
   // Update high contrast mode on the passed display.
-  void UpdateDisplay(aura::Window* root_window);
+  void UpdateDisplay(aura::RootWindow* root_window);
 
   // Indicates if the high contrast mode is enabled or disabled.
   bool enabled_;