chrome/browser/chromeos/display/display_preferences.cc - Issue 1107383002: 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: chrome/browser/chromeos/display/display_preferences.cc

Issue 1107383002: 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/wm/maximize_mode/maximize_mode_controller_unittest.cc ('k') | chrome/browser/chromeos/display/display_preferences_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/display/display_preferences.cc

diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc

index a71342ddcd4b3305d1f33b94209a9f041ba8d527..067d582e533c48381a5a4dce972ffd3475d9892a 100644

--- a/chrome/browser/chromeos/display/display_preferences.cc

+++ b/chrome/browser/chromeos/display/display_preferences.cc

@@ -251,7 +251,9 @@ void StoreCurrentDisplayProperties() {

scoped_ptr<base::DictionaryValue> property_value(

new base::DictionaryValue());

- property_value->SetInteger("rotation", static_cast<int>(info.rotation()));

+ property_value->SetInteger(

+ "rotation",

+ static_cast<int>(info.GetRotation(gfx::Display::ROTATION_SOURCE_USER)));

property_value->SetInteger(

"ui-scale",

static_cast<int>(info.configured_ui_scale() * 1000));

@@ -356,8 +358,9 @@ void StoreDisplayRotationPrefs(bool rotation_lock) {

DictionaryPrefUpdate update(local_state, prefs::kDisplayRotationLock);

base::DictionaryValue* pref_data = update.Get();

pref_data->SetBoolean("lock", rotation_lock);

- gfx::Display::Rotation rotation = display_manager->

- GetDisplayInfo(gfx::Display::InternalDisplayId()).rotation();

+ gfx::Display::Rotation rotation =

+ display_manager->->GetDisplayInfo(gfx::Display::InternalDisplayId())

+ .GetRotation(gfx::Display::ROTATION_SOURCE_ACCELEROMETER);

pref_data->SetInteger("orientation", static_cast<int>(rotation));

}