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

trunk/src/ash/wm/partial_screenshot_view.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/partial_screenshot_view.h"
 
 #include <algorithm>
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 66 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(OverlayDelegate);
 };
 
 // static
 std::vector<PartialScreenshotView*>
 PartialScreenshotView::StartPartialScreenshot(
     ScreenshotDelegate* screenshot_delegate) {
   std::vector<PartialScreenshotView*> views;
   OverlayDelegate* overlay_delegate = new OverlayDelegate();
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  for (aura::Window::Windows::iterator it = root_windows.begin();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+  for (Shell::RootWindowList::iterator it = root_windows.begin();
        it != root_windows.end(); ++it) {
     PartialScreenshotView* new_view = new PartialScreenshotView(
         overlay_delegate, screenshot_delegate);
     new_view->Init(*it);
     views.push_back(new_view);
   }
   return views;
 }
 
 PartialScreenshotView::PartialScreenshotView(
     PartialScreenshotView::OverlayDelegate* overlay_delegate,
     ScreenshotDelegate* screenshot_delegate)
     : is_dragging_(false),
       overlay_delegate_(overlay_delegate),
       screenshot_delegate_(screenshot_delegate) {
 }
 
 PartialScreenshotView::~PartialScreenshotView() {
   overlay_delegate_ = NULL;
   screenshot_delegate_ = NULL;
 }
 
-void PartialScreenshotView::Init(aura::Window* root_window) {
+void PartialScreenshotView::Init(aura::RootWindow* root_window) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.delegate = this;
   // The partial screenshot rectangle has to be at the real top of
   // the screen.
   params.parent = Shell::GetContainer(
       root_window,
       internal::kShellWindowId_OverlayContainer);
@@ skipping 112 matching lines @@
       OnSelectionFinished();
       break;
     default:
       break;
   }
 
   event->SetHandled();
 }
 
 }  // namespace ash