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

trunk/src/ash/touch/touch_hud_debug.cc

 // Copyright 2013 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/touch/touch_hud_debug.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 353 matching lines @@
   label_container_->SetVisible(false);
   content->AddChildView(label_container_);
 }
 
 TouchHudDebug::~TouchHudDebug() {
 }
 
 // static
 scoped_ptr<DictionaryValue> TouchHudDebug::GetAllAsDictionary() {
   scoped_ptr<DictionaryValue> value(new DictionaryValue());
-  aura::Window::Windows roots = Shell::GetInstance()->GetAllRootWindows();
-  for (aura::Window::Windows::iterator iter = roots.begin();
+  Shell::RootWindowList roots = Shell::GetInstance()->GetAllRootWindows();
+  for (Shell::RootWindowList::iterator iter = roots.begin();
       iter != roots.end(); ++iter) {
     internal::RootWindowController* controller = GetRootWindowController(*iter);
     internal::TouchHudDebug* hud = controller->touch_hud_debug();
     if (hud) {
       scoped_ptr<ListValue> list = hud->GetLogAsList();
       if (!list->empty())
         value->Set(base::Int64ToString(hud->display_id()), list.release());
     }
   }
   return value.Pass();
@@ skipping 95 matching lines @@
   controller->set_touch_hud_debug(this);
 }
 
 void TouchHudDebug::UnsetHudForRootWindowController(
     RootWindowController* controller) {
   controller->set_touch_hud_debug(NULL);
 }
 
 }  // namespace internal
 }  // namespace ash