ui/views/widget/desktop_aura/x11_window_event_filter.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.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: ui/views/widget/desktop_aura/x11_window_event_filter.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: and another rebase 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:

Index: ui/views/widget/desktop_aura/x11_window_event_filter.cc

diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc

index c8f1065d31e23e75bb5962e3f747b2fc358ba7fd..c0ead5563fdc226bdd26ab02436c930589ea6571 100644

--- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc

+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc

@@ -151,9 +151,8 @@ void X11WindowEventFilter::OnClickedMaximizeButton(ui::MouseEvent* event) {

if (!widget)

return;

- gfx::Screen* screen = gfx::Screen::GetNativeScreen();

gfx::Rect display_work_area =

- screen->GetDisplayNearestWindow(target).work_area();

+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(target).work_area();

gfx::Rect bounds = widget->GetWindowBoundsInScreen();

if (event->IsMiddleMouseButton()) {

bounds.set_y(display_work_area.y());