Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: trunk/src/chrome/browser/ui/ash/screenshot_taker.cc

Issue 59153004: Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/ash/screenshot_taker.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/screenshot_taker.cc (revision 233812)
+++ trunk/src/chrome/browser/ui/ash/screenshot_taker.cc (working copy)
@@ -341,7 +341,7 @@
std::string screenshot_basename = !screenshot_basename_for_test_.empty() ?
screenshot_basename_for_test_ : GetScreenshotBaseFilename();
- aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
+ ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
// Reorder root_windows to take the primary root window's snapshot at first.
aura::Window* primary_root = ash::Shell::GetPrimaryRootWindow();
if (*(root_windows.begin()) != primary_root) {
@@ -350,7 +350,7 @@
root_windows.insert(root_windows.begin(), primary_root->GetDispatcher());
}
for (size_t i = 0; i < root_windows.size(); ++i) {
- aura::Window* root_window = root_windows[i];
+ aura::RootWindow* root_window = root_windows[i];
scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes);
std::string basename = screenshot_basename;
gfx::Rect rect = root_window->bounds();

Powered by Google App Engine
This is Rietveld 408576698