ash/magnifier/magnification_controller.cc - Issue 2660873002: Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Created 3 years, 11 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:

Index: ash/magnifier/magnification_controller.cc

diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc

index c677caae5c56b2b741f3a8ae9c87dffc785470b0..e6c987d1525dc503e0d563ca4ef5bad4137e129d 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"

@@ -437,8 +436,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;