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

Unified Diff: trunk/src/ash/display/screen_position_controller.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/ash/display/screen_position_controller.cc
===================================================================
--- trunk/src/ash/display/screen_position_controller.cc (revision 233812)
+++ trunk/src/ash/display/screen_position_controller.cc (working copy)
@@ -92,16 +92,16 @@
root_window->GetDispatcher()->ConvertPointToNativeScreen(
&location_in_native);
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
for (size_t i = 0; i < root_windows.size(); ++i) {
- aura::WindowEventDispatcher* dispatcher =
- root_windows[i]->GetDispatcher();
const gfx::Rect native_bounds(
- dispatcher->GetHostOrigin(),
- dispatcher->GetHostSize()); // in px.
+ root_windows[i]->GetHostOrigin(),
+ root_windows[i]->GetHostSize()); // in px.
if (native_bounds.Contains(location_in_native)) {
+ root_window = root_windows[i];
location_in_root = location_in_native;
- dispatcher->ConvertPointFromNativeScreen(&location_in_root);
+ root_window->GetDispatcher()->ConvertPointFromNativeScreen(
+ &location_in_root);
break;
}
}

Powered by Google App Engine
This is Rietveld 408576698