ui/views/widget/widget.cc - Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm

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/widget.cc

Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more cleanups Created 4 years, 8 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: ui/views/widget/widget.cc

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

index d2b27c9c18a675a16cae216ef469262f809ff120..4cfb3db02ba5d72894bf76245a310a3f37c1bea2 100644

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

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

@@ -18,10 +18,10 @@

#include "ui/base/resource/resource_bundle.h"

#include "ui/compositor/compositor.h"

#include "ui/compositor/layer.h"

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

#include "ui/events/event.h"

#include "ui/events/event_utils.h"

#include "ui/gfx/image/image_skia.h"

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

#include "ui/views/controls/menu/menu_controller.h"

#include "ui/views/event_monitor.h"

#include "ui/views/focus/focus_manager.h"

@@ -502,7 +502,7 @@ void Widget::CenterWindow(const gfx::Size& size) {

}

void Widget::SetBoundsConstrained(const gfx::Rect& bounds) {

- gfx::Rect work_area = gfx::Screen::GetScreen()

+ gfx::Rect work_area = display::Screen::GetScreen()

->GetDisplayNearestPoint(bounds.origin())

.work_area();

if (work_area.IsEmpty()) {

« no previous file with comments | « ui/views/widget/tooltip_manager_aura.cc ('k') | ui/views/win/hwnd_message_handler.cc » ('j') | no next file with comments »