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

Unified Diff: ash/magnifier/magnification_controller.cc

Issue 2660873002: Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h (Closed)
Patch Set: rebase Created 3 years, 10 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/common/wm_window.cc ('k') | ash/screen_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/magnification_controller.cc
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index 9a324193d751978d3dffb85701ed6335d733a958..aa8295b4057111d6d95664795c15356d60e8726a 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -15,7 +15,6 @@
#include "ash/host/ash_window_tree_host.h"
#include "ash/host/root_window_transformer.h"
#include "ash/root_window_controller.h"
-#include "ash/screen_util.h"
#include "ash/shell.h"
#include "base/command_line.h"
#include "base/synchronization/waitable_event.h"
@@ -440,8 +439,8 @@ void MagnificationControllerImpl::HandleFocusedNodeChanged(
if (node_bounds_in_screen.IsEmpty())
return;
- gfx::Rect node_bounds_in_root =
- ScreenUtil::ConvertRectFromScreen(root_window_, node_bounds_in_screen);
+ gfx::Rect node_bounds_in_root = node_bounds_in_screen;
+ ::wm::ConvertRectFromScreen(root_window_, &node_bounds_in_root);
if (GetViewportRect().Contains(node_bounds_in_root))
return;
« no previous file with comments | « ash/common/wm_window.cc ('k') | ash/screen_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698