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

Unified Diff: trunk/src/ash/wm/ash_native_cursor_manager.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
« no previous file with comments | « trunk/src/ash/touch/touch_hud_debug.cc ('k') | trunk/src/ash/wm/dock/docked_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/wm/ash_native_cursor_manager.cc
===================================================================
--- trunk/src/ash/wm/ash_native_cursor_manager.cc (revision 233812)
+++ trunk/src/ash/wm/ash_native_cursor_manager.cc (working copy)
@@ -17,11 +17,11 @@
namespace {
void SetCursorOnAllRootWindows(gfx::NativeCursor cursor) {
- aura::Window::Windows root_windows =
+ Shell::RootWindowList root_windows =
Shell::GetInstance()->GetAllRootWindows();
- for (aura::Window::Windows::iterator iter = root_windows.begin();
+ for (Shell::RootWindowList::iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter)
- (*iter)->GetDispatcher()->SetCursor(cursor);
+ (*iter)->SetCursor(cursor);
#if defined(OS_CHROMEOS)
Shell::GetInstance()->display_controller()->
mirror_window_controller()->SetMirroredCursor(cursor);
@@ -29,11 +29,11 @@
}
void NotifyCursorVisibilityChange(bool visible) {
- aura::Window::Windows root_windows =
+ Shell::RootWindowList root_windows =
Shell::GetInstance()->GetAllRootWindows();
- for (aura::Window::Windows::iterator iter = root_windows.begin();
+ for (Shell::RootWindowList::iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter)
- (*iter)->GetDispatcher()->OnCursorVisibilityChanged(visible);
+ (*iter)->OnCursorVisibilityChanged(visible);
#if defined(OS_CHROMEOS)
Shell::GetInstance()->display_controller()->mirror_window_controller()->
SetMirroredCursorVisibility(visible);
@@ -41,11 +41,11 @@
}
void NotifyMouseEventsEnableStateChange(bool enabled) {
- aura::Window::Windows root_windows =
+ Shell::RootWindowList root_windows =
Shell::GetInstance()->GetAllRootWindows();
- for (aura::Window::Windows::iterator iter = root_windows.begin();
+ for (Shell::RootWindowList::iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter)
- (*iter)->GetDispatcher()->OnMouseEventsEnableStateChanged(enabled);
+ (*iter)->OnMouseEventsEnableStateChanged(enabled);
// Mirror window never process events.
}
« no previous file with comments | « trunk/src/ash/touch/touch_hud_debug.cc ('k') | trunk/src/ash/wm/dock/docked_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698