ash/display/screen_ash.cc - Issue 249303002: Revert of Use platform's device scale factor for cursor

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/display/screen_ash.cc

Issue 249303002: Revert of Use platform's device scale factor for cursor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: ash/display/screen_ash.cc

diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc

index 9d42e49e26724dc8ee03b2daa08fc3eb282b9539..d32deb85c4edd19d028acafb612e43be128233db 100644

--- a/ash/display/screen_ash.cc

+++ b/ash/display/screen_ash.cc

@@ -234,8 +234,7 @@

return GetPrimaryDisplay();

const RootWindowSettings* rws = GetRootWindowSettings(root_window);

if (rws->shutdown)

- return GetPrimaryDisplay();

+ return gfx::Display(1);

int64 id = rws->display_id;

// if id is |kInvaildDisplayID|, it's being deleted.

DCHECK(id != gfx::Display::kInvalidDisplayID);