ash/display/display_controller.cc - Issue 1108343002: Revert of Merge Prevent DisplayPreferences from saving incorrect rotations.

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

Issue 1108343002: Revert of Merge Prevent DisplayPreferences from saving incorrect rotations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2357

Patch Set: Created 5 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 | « ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('k') | ash/display/display_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/display/display_controller.cc

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

index da51923c8e1461cd67a3c5bb55b8d40ef6dde0b8..166a76f0cdc26dce639190d0720e37504d73ce59 100644

--- a/ash/display/display_controller.cc

+++ b/ash/display/display_controller.cc

@@ -109,7 +109,7 @@

const char kInternalProp[] = "_CHROME_DISPLAY_INTERNAL";

const char kCARDINAL[] = "CARDINAL";

int xrandr_rotation = RR_Rotate_0;

- switch (info.GetActiveRotation()) {

+ switch (info.rotation()) {

case gfx::Display::ROTATE_0:

xrandr_rotation = RR_Rotate_0;

break;

@@ -140,7 +140,7 @@

scale *= kCursorMultiplierForExternalDisplays;

ui::CursorController::GetInstance()->SetCursorConfigForWindow(

- host->GetAcceleratedWidget(), info.GetActiveRotation(), scale);

+ host->GetAcceleratedWidget(), info.rotation(), scale);

#endif

scoped_ptr<RootWindowTransformer> transformer(