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

Unified Diff: ash/display/window_tree_host_manager.cc

Issue 2525113002: Rename WindowTreeHost functions to indicate pixels/dips. (Closed)
Patch Set: win 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/unified_mouse_warp_controller_unittest.cc ('k') | ash/host/ash_window_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/window_tree_host_manager.cc
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
index 76379889b9799e4a13ca15d051085e4209e955ce..3ee9f48062daa279697ee328d8fdaa614128f216 100644
--- a/ash/display/window_tree_host_manager.cc
+++ b/ash/display/window_tree_host_manager.cc
@@ -529,7 +529,7 @@ void WindowTreeHostManager::UpdateMouseLocationAfterDisplayChange() {
closest_distance_squared > distance_squared) {
aura::Window* root_window = GetRootWindowForDisplayId(display.id());
::wm::ConvertPointFromScreen(root_window, &center);
- root_window->GetHost()->ConvertPointToNativeScreen(&center);
+ root_window->GetHost()->ConvertDIPToScreenInPixels(&center);
dst_root_window = root_window;
target_location_in_native = center;
closest_distance_squared = distance_squared;
@@ -537,7 +537,7 @@ void WindowTreeHostManager::UpdateMouseLocationAfterDisplayChange() {
}
gfx::Point target_location_in_root = target_location_in_native;
- dst_root_window->GetHost()->ConvertPointFromNativeScreen(
+ dst_root_window->GetHost()->ConvertScreenInPixelsToDIP(
&target_location_in_root);
#if defined(USE_OZONE)
@@ -791,7 +791,7 @@ void WindowTreeHostManager::PreDisplayConfigurationChange(bool clear_focus) {
gfx::Point point_in_native = point_in_screen;
aura::Window* root_window = GetRootWindowForDisplayId(display.id());
::wm::ConvertPointFromScreen(root_window, &point_in_native);
- root_window->GetHost()->ConvertPointToNativeScreen(&point_in_native);
+ root_window->GetHost()->ConvertDIPToScreenInPixels(&point_in_native);
cursor_location_in_native_coords_for_restore_ = point_in_native;
}
« no previous file with comments | « ash/display/unified_mouse_warp_controller_unittest.cc ('k') | ash/host/ash_window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698