ui/base/cursor/cursor_loader_x11.cc - Issue 1917083002: Move gfx::Display/Screen to display::Display/Screen in ui/base

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/base/cursor/cursor_loader_x11.cc

Issue 1917083002: Move gfx::Display/Screen to display::Display/Screen in ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/base/cursor/cursor_loader_x11.cc

diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc

index aff40d2f0ae9ddf90bdd122c73242b3afab86eb8..6bf237d78ba4a12bb141bd458351aad1cc1cc02f 100644

--- a/ui/base/cursor/cursor_loader_x11.cc

+++ b/ui/base/cursor/cursor_loader_x11.cc

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

#include "ui/base/cursor/cursor.h"

#include "ui/base/cursor/cursor_util.h"

#include "ui/base/x/x11_util.h"

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

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

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

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

@@ -209,7 +210,7 @@ void CursorLoaderX11::SetPlatformCursor(gfx::NativeCursor* cursor) {

xcursor = invisible_cursor_.get();

else if (*cursor == kCursorCustom)

xcursor = cursor->platform();

- else if (scale() == 1.0f && rotation() == gfx::Display::ROTATE_0) {

+ else if (scale() == 1.0f && rotation() == display::Display::ROTATE_0) {

xcursor = GetXCursor(CursorShapeFromNative(*cursor));

} else {

xcursor = ImageCursorFromNative(kCursorPointer);

« no previous file with comments | « ui/base/cursor/cursor_loader_x11.h ('k') | ui/base/cursor/cursor_loader_x11_unittest.cc » ('j') | no next file with comments »