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

Unified Diff: ash/touch/touch_hud_debug.cc

Issue 2911393002: Nix GetRootWindowController, use RootWindowController::ForWindow. (Closed)
Patch Set: Sync and rebase AGAIN Created 3 years, 7 months 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
« no previous file with comments | « ash/system/toast/toast_overlay.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_hud_debug.cc
diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc
index fa40050b66dcdad8f32963c30dbbf18be6eafbc2..dc63d0b8bae84fafd40c63a2600e950cb314318d 100644
--- a/ash/touch/touch_hud_debug.cc
+++ b/ash/touch/touch_hud_debug.cc
@@ -357,10 +357,8 @@ TouchHudDebug::~TouchHudDebug() {}
std::unique_ptr<base::DictionaryValue> TouchHudDebug::GetAllAsDictionary() {
std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
aura::Window::Windows roots = Shell::Get()->GetAllRootWindows();
- for (aura::Window::Windows::iterator iter = roots.begin();
- iter != roots.end(); ++iter) {
- RootWindowController* controller = GetRootWindowController(*iter);
- TouchHudDebug* hud = controller->touch_hud_debug();
+ for (RootWindowController* root : Shell::GetAllRootWindowControllers()) {
+ TouchHudDebug* hud = root->touch_hud_debug();
if (hud) {
std::unique_ptr<base::ListValue> list = hud->GetLogAsList();
if (!list->empty())
« no previous file with comments | « ash/system/toast/toast_overlay.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698