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

Unified Diff: ash/debug.cc

Issue 64933002: Eliminate Shell::RootWindowList in favor of aura::Window::Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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: ash/debug.cc
diff --git a/ash/debug.cc b/ash/debug.cc
index 060627cadc0d5f4010ab87449ce90130c7218ea1..f5c62200c7635398ee1c7cdf6e0c383b4adc65b1 100644
--- a/ash/debug.cc
+++ b/ash/debug.cc
@@ -13,12 +13,12 @@ namespace ash {
namespace debug {
void ToggleShowDebugBorders() {
- Shell::RootWindowList root_windows =
+ aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
scoped_ptr<bool> value;
- for (Shell::RootWindowList::iterator it = root_windows.begin();
+ for (aura::Window::Windows::iterator it = root_windows.begin();
it != root_windows.end(); ++it) {
- ui::Compositor* compositor = (*it)->compositor();
+ ui::Compositor* compositor = (*it)->GetDispatcher()->compositor();
cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
if (!value.get())
value.reset(new bool(!state.show_debug_borders));
@@ -28,12 +28,12 @@ void ToggleShowDebugBorders() {
}
void ToggleShowFpsCounter() {
- Shell::RootWindowList root_windows =
+ aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
scoped_ptr<bool> value;
- for (Shell::RootWindowList::iterator it = root_windows.begin();
+ for (aura::Window::Windows::iterator it = root_windows.begin();
it != root_windows.end(); ++it) {
- ui::Compositor* compositor = (*it)->compositor();
+ ui::Compositor* compositor = (*it)->GetDispatcher()->compositor();
cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
if (!value.get())
value.reset(new bool(!state.show_fps_counter));
@@ -43,12 +43,12 @@ void ToggleShowFpsCounter() {
}
void ToggleShowPaintRects() {
- Shell::RootWindowList root_windows =
+ aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
scoped_ptr<bool> value;
- for (Shell::RootWindowList::iterator it = root_windows.begin();
+ for (aura::Window::Windows::iterator it = root_windows.begin();
it != root_windows.end(); ++it) {
- ui::Compositor* compositor = (*it)->compositor();
+ ui::Compositor* compositor = (*it)->GetDispatcher()->compositor();
cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
if (!value.get())
value.reset(new bool(!state.show_paint_rects));

Powered by Google App Engine
This is Rietveld 408576698