ui/views/view.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/view.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

« no previous file with comments | « ui/views/touchui/touch_selection_controller_impl.cc ('k') | ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/view.cc

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

index 60d8e8903e3da79516583d4539c5417e9c6f177e..391abaced2076fb90c88d62a7bbd0ec45feabc8f 100644

--- a/ui/views/view.cc

+++ b/ui/views/view.cc

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

#include "ui/compositor/paint_context.h"

#include "ui/compositor/paint_recorder.h"

#include "ui/compositor/transform_recorder.h"

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

#include "ui/events/event_target_iterator.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/geometry/point3_f.h"

@@ -40,7 +41,6 @@

#include "ui/gfx/interpolated_transform.h"

#include "ui/gfx/path.h"

#include "ui/gfx/scoped_canvas.h"

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

#include "ui/gfx/skia_util.h"

#include "ui/gfx/transform.h"

#include "ui/native_theme/native_theme.h"

@@ -954,7 +954,7 @@ bool View::IsMouseHovered() const {

if (!GetWidget()->IsMouseEventsEnabled())

return false;

- gfx::Point cursor_pos(gfx::Screen::GetScreen()->GetCursorScreenPoint());

+ gfx::Point cursor_pos(display::Screen::GetScreen()->GetCursorScreenPoint());

ConvertPointFromScreen(this, &cursor_pos);

return HitTestPoint(cursor_pos);

}