commit 6581246501397683c273ee19ecf89b00f071dc9f
author mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 11 00:49:33 2012
committer mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 11 00:49:33 2012
tree e39b30f116c9cede6e8e49418947ac9377da9e9f
parent ee27953befd6b4c683538675d7205e55b0d9168d

Stores the primary display ID to Local State since it should be available in login screen too.

Now only normal users can edit the preference.

BUG=154337
TEST=see bug for the details / on lumpy, connect an external display, login, Alt-F4, logout, and then see which display has the login console.

Review URL: https://chromiumcodereview.appspot.com/11094026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161246 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 06cdbf887..5b4153b 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -96,6 +96,7 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/customization_document.h"
+#include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -191,12 +192,13 @@
 
 #if defined(OS_CHROMEOS)
   chromeos::AudioHandler::RegisterPrefs(local_state);
-  chromeos::language_prefs::RegisterPrefs(local_state);
   chromeos::DataPromoNotification::RegisterPrefs(local_state);
-  chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
-  chromeos::UserManager::RegisterPrefs(local_state);
-  chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
   chromeos::device_settings_cache::RegisterPrefs(local_state);
+  chromeos::language_prefs::RegisterPrefs(local_state);
+  chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
+  chromeos::RegisterDisplayLocalStatePrefs(local_state);
+  chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
+  chromeos::UserManager::RegisterPrefs(local_state);
   chromeos::WallpaperManager::RegisterPrefs(local_state);
   chromeos::WizardController::RegisterPrefs(local_state);
   policy::AutoEnrollmentClient::RegisterPrefs(local_state);