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

Unified Diff: chrome/browser/ui/ash/multi_user_window_manager.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: chrome/browser/ui/ash/multi_user_window_manager.cc
diff --git a/chrome/browser/ui/ash/multi_user_window_manager.cc b/chrome/browser/ui/ash/multi_user_window_manager.cc
index 1acf61551f4bce317fc10b00d4f9f309173b681d..6df5012293893b75d327827c7e6ba94d87283871 100644
--- a/chrome/browser/ui/ash/multi_user_window_manager.cc
+++ b/chrome/browser/ui/ash/multi_user_window_manager.cc
@@ -69,11 +69,11 @@ bool IsProcessingUserEvent() {
// anymore) and the root window should therefore still have the event which
// lead to the menu invocation, but it is not. By fixing that problem this
// would "magically work".
- ash::Shell::RootWindowList root_window_list = ash::Shell::GetAllRootWindows();
- for (ash::Shell::RootWindowList::iterator it = root_window_list.begin();
+ aura::Window::Windows root_window_list = ash::Shell::GetAllRootWindows();
+ for (aura::Window::Windows::iterator it = root_window_list.begin();
it != root_window_list.end();
++it) {
- if (IsUserEvent((*it)->current_event()))
+ if (IsUserEvent((*it)->GetDispatcher()->current_event()))
return true;
}
return false;

Powered by Google App Engine
This is Rietveld 408576698