diff options
author | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 14:25:46 +0000 |
---|---|---|
committer | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 14:25:46 +0000 |
commit | 20564b3c9de85ff469ef51240d26fa965dd45619 (patch) | |
tree | 7bb8661191285d57c0a7bf8803c4642e261ff635 /chrome/browser/prefs | |
parent | 224e75e4f3778203e4ab199bbd8bbf287e4af4f5 (diff) | |
download | chromium_src-20564b3c9de85ff469ef51240d26fa965dd45619.zip chromium_src-20564b3c9de85ff469ef51240d26fa965dd45619.tar.gz chromium_src-20564b3c9de85ff469ef51240d26fa965dd45619.tar.bz2 |
Store settings that should be signed in temporary place before owner is assigned.
Make proxy settings work on welcome screen in chromium OS.
BUG=http://crosbug.com/3062
TEST=Manual
Review URL: http://codereview.chromium.org/3860001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 0b65bf0..f967746 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -63,6 +63,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros_settings_provider_user.h" #include "chrome/browser/chromeos/login/apply_services_customization.h" +#include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/preferences.h" @@ -103,6 +104,7 @@ void RegisterLocalState(PrefService* local_state) { WizardController::RegisterPrefs(local_state); chromeos::InputMethodMenuButton::RegisterPrefs(local_state); chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); + chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); #endif } |