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

Unified Diff: ash/display/screen_position_controller.cc

Issue 2524873002: Rename WindowTreeHost G|SetBounds to indicate they are in pixels. (Closed)
Patch Set: rebase Created 4 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 | « ash/display/mirror_window_controller.cc ('k') | ash/display/screen_position_controller_unittest.cc » ('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 9ab7bb0a24d1dedcddf15c55e56b37ddb87cc5bd..b41c51145d2e21c46dc3f0428e4438fe6fc9865c 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -39,7 +39,7 @@ void ScreenPositionController::ConvertHostPointToRelativeToRootWindow(
root_window->GetHost()->ConvertPointFromHost(&point_in_root);
#if defined(USE_X11) || defined(USE_OZONE)
- gfx::Rect host_bounds(root_window->GetHost()->GetBounds().size());
+ gfx::Rect host_bounds(root_window->GetHost()->GetBoundsInPixels().size());
if (!host_bounds.Contains(*point)) {
// This conversion is necessary to deal with X's passive input
// grab while dragging window. For example, if we have two
@@ -67,7 +67,7 @@ void ScreenPositionController::ConvertHostPointToRelativeToRootWindow(
for (size_t i = 0; i < root_windows.size(); ++i) {
aura::WindowTreeHost* host = root_windows[i]->GetHost();
- const gfx::Rect native_bounds = host->GetBounds();
+ const gfx::Rect native_bounds = host->GetBoundsInPixels();
if (native_bounds.Contains(location_in_native)) {
*target_root = root_windows[i];
*point = location_in_native;
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/display/screen_position_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698