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

Unified Diff: ash/wm/ash_native_cursor_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: ash/wm/ash_native_cursor_manager.cc
diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc
index 6b888093edc79d676eabf31f86d15fada74c19b4..6753796710be9e967471507e199d31989e158c78 100644
--- a/ash/wm/ash_native_cursor_manager.cc
+++ b/ash/wm/ash_native_cursor_manager.cc
@@ -17,11 +17,11 @@ namespace ash {
namespace {
void SetCursorOnAllRootWindows(gfx::NativeCursor cursor) {
- Shell::RootWindowList root_windows =
+ aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
- for (Shell::RootWindowList::iterator iter = root_windows.begin();
+ for (aura::Window::Windows::iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter)
- (*iter)->SetCursor(cursor);
+ (*iter)->GetDispatcher()->SetCursor(cursor);
#if defined(OS_CHROMEOS)
Shell::GetInstance()->display_controller()->
mirror_window_controller()->SetMirroredCursor(cursor);
@@ -29,11 +29,11 @@ void SetCursorOnAllRootWindows(gfx::NativeCursor cursor) {
}
void NotifyCursorVisibilityChange(bool visible) {
- Shell::RootWindowList root_windows =
+ aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
- for (Shell::RootWindowList::iterator iter = root_windows.begin();
+ for (aura::Window::Windows::iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter)
- (*iter)->OnCursorVisibilityChanged(visible);
+ (*iter)->GetDispatcher()->OnCursorVisibilityChanged(visible);
#if defined(OS_CHROMEOS)
Shell::GetInstance()->display_controller()->mirror_window_controller()->
SetMirroredCursorVisibility(visible);
@@ -41,11 +41,11 @@ void NotifyCursorVisibilityChange(bool visible) {
}
void NotifyMouseEventsEnableStateChange(bool enabled) {
- Shell::RootWindowList root_windows =
+ aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
- for (Shell::RootWindowList::iterator iter = root_windows.begin();
+ for (aura::Window::Windows::iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter)
- (*iter)->OnMouseEventsEnableStateChanged(enabled);
+ (*iter)->GetDispatcher()->OnMouseEventsEnableStateChanged(enabled);
// Mirror window never process events.
}

Powered by Google App Engine
This is Rietveld 408576698