ash/display/event_transformation_handler.cc - Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

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/display/event_transformation_handler.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5

Patch Set: cros Created 4 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/display/event_transformation_handler.cc

diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc

index e1af21fca07e789f6752f2fa6485bf966c292e4d..484a20a98b175c2673a2750d98af12d4f10044c6 100644

--- a/ash/display/event_transformation_handler.cc

+++ b/ash/display/event_transformation_handler.cc

@@ -8,7 +8,6 @@

#include "ash/display/display_info.h"

#include "ash/display/display_manager.h"

-#include "ash/shell.h"

#include "ash/wm/window_util.h"

#include "ui/aura/window.h"

#include "ui/aura/window_event_dispatcher.h"

@@ -43,7 +42,7 @@ void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) {

aura::Window* target = static_cast<aura::Window*>(event->target());

::wm::ConvertPointToScreen(target, &point_in_screen);

const gfx::Display& display =

- Shell::GetScreen()->GetDisplayNearestPoint(point_in_screen);

+ gfx::Screen::GetScreen()->GetDisplayNearestPoint(point_in_screen);

// Apply some additional scaling if the display is non-integrated.

if (!display.IsInternal())

« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/extended_mouse_warp_controller.cc » ('j') | no next file with comments »