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

Unified Diff: ash/display/screen_position_controller.cc

Issue 38423002: Make aura::clients take Window instead of RootWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 2 months 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 | « ash/display/screen_position_controller.h ('k') | ash/drag_drop/drag_drop_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_position_controller.cc
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index 60528ec2955ca83fcc7a930727e68b22e7cf54d7..3713b78a1774e879c3615e336c15ffb56fb9581c 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -136,11 +136,12 @@ void ScreenPositionController::ConvertPointFromScreen(
}
void ScreenPositionController::ConvertHostPointToScreen(
- aura::RootWindow* root_window,
+ aura::Window* root_window,
gfx::Point* point) {
- root_window->ConvertPointFromHost(point);
+ aura::RootWindow* root = root_window->GetRootWindow();
+ root->ConvertPointFromHost(point);
std::pair<aura::RootWindow*, gfx::Point> pair =
- GetRootWindowRelativeToWindow(root_window, *point);
+ GetRootWindowRelativeToWindow(root, *point);
*point = pair.second;
ConvertPointToScreen(pair.first, point);
}
« no previous file with comments | « ash/display/screen_position_controller.h ('k') | ash/drag_drop/drag_drop_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698