chrome/browser/chromeos/display/display_preferences.cc - Issue 12438016: Save display preference when all display configuration changes has been completed.

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 12438016: Save display preference when all display configuration changes has been completed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: replace dcheck Created 7 years, 9 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 | « chrome/browser/chromeos/display/display_configuration_observer.cc ('k') | chrome/browser/chromeos/display/primary_display_switch_observer.h » ('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 0946980c5497c6cab24397795ffea44dc630cc50..f62485eb902951713e321a32f494eabe63fc9439 100644

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

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

@@ -180,7 +180,7 @@ void StoreCurrentDisplayLayoutPrefs() {

void StorePrimaryDisplayIDPref(int64 display_id) {

- if (!IsValidUser())

+ if (!IsValidUser() || gfx::Screen::GetNativeScreen()->GetNumDisplays() < 2)

return;

PrefService* local_state = g_browser_process->local_state();

@@ -211,8 +211,13 @@ void RegisterDisplayLocalStatePrefs(PrefRegistrySimple* registry) {

}

void StoreDisplayPrefs() {

- StorePrimaryDisplayIDPref(ash::Shell::GetScreen()->GetPrimaryDisplay().id());

- StoreCurrentDisplayLayoutPrefs();

+ if (!IsValidUser())

+ return;

+ if (gfx::Screen::GetNativeScreen()->GetNumDisplays() == 2) {

+ StorePrimaryDisplayIDPref(

+ ash::Shell::GetScreen()->GetPrimaryDisplay().id());

+ StoreCurrentDisplayLayoutPrefs();

+ }

}

void SetAndStoreDisplayLayoutPref(int layout, int offset) {