ash/shelf/shelf_bezel_event_filter.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/shelf/shelf_bezel_event_filter.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/shelf/shelf_bezel_event_filter.cc

diff --git a/ash/shelf/shelf_bezel_event_filter.cc b/ash/shelf/shelf_bezel_event_filter.cc

index c3c46f312eddbca66944c9dc8c1b3cb0b0bdebeb..14ec7dc2698a30d43eb0be1bcfbf555c096d81d4 100644

--- a/ash/shelf/shelf_bezel_event_filter.cc

+++ b/ash/shelf/shelf_bezel_event_filter.cc

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

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shell.h"

#include "ui/aura/window.h"

+#include "ui/gfx/screen.h"

#include "ui/wm/core/coordinate_conversion.h"

namespace ash {

@@ -27,8 +28,9 @@ void ShelfBezelEventFilter::OnGestureEvent(

gfx::Point point_in_screen(event->location());

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

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

- gfx::Rect screen =

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

+ gfx::Rect screen = gfx::Screen::GetScreen()

+ ->GetDisplayNearestPoint(point_in_screen)

+ .bounds();

if ((!screen.Contains(point_in_screen) &&

IsShelfOnBezel(screen, point_in_screen)) ||

in_touch_drag_) {

« no previous file with comments | « ash/shelf/overflow_bubble_view.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »