summaryrefslogtreecommitdiffstats
path: root/ash/display/screen_position_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/display/screen_position_controller.cc')
-rw-r--r--ash/display/screen_position_controller.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index 7f61d1a..c8b8c1d 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -92,16 +92,16 @@ std::pair<aura::RootWindow*, gfx::Point> GetRootWindowRelativeToWindow(
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;
}
}