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

Unified Diff: trunk/src/chrome/browser/ui/ash/launcher/browser_status_monitor.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/launcher/browser_status_monitor.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/launcher/browser_status_monitor.cc (revision 233812)
+++ trunk/src/chrome/browser/ui/ash/launcher/browser_status_monitor.cc (working copy)
@@ -60,8 +60,8 @@
if (ash::Shell::HasInstance()) {
// We can't assume all RootWindows have the same ActivationClient.
// Add a RootWindow and its ActivationClient to the observed list.
- aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
- aura::Window::Windows::const_iterator iter = root_windows.begin();
+ ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
+ ash::Shell::RootWindowList::const_iterator iter = root_windows.begin();
for (; iter != root_windows.end(); ++iter) {
// |observed_activation_clients_| can have the same activation client
// multiple times - which would be handled by the used
« no previous file with comments | « trunk/src/chrome/browser/ui/ash/ash_util.cc ('k') | trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698