diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 11:52:24 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 11:52:24 +0000 |
| commit | 1faaab7bcf1aadc661c12316fef434e3e2c30c6a (patch) | |
| tree | 6a9df5c14a52616ab193a2d1ee36b730d9fda6fe /chrome/browser/prefs | |
| parent | c70d54d8f5527ada49cee016cd363f2367158648 (diff) | |
| download | chromium_src-1faaab7bcf1aadc661c12316fef434e3e2c30c6a.zip chromium_src-1faaab7bcf1aadc661c12316fef434e3e2c30c6a.tar.gz chromium_src-1faaab7bcf1aadc661c12316fef434e3e2c30c6a.tar.bz2 | |
ChromeOS: Add a per user and a local state network preference.
- Adds a network preference kOpenNetworkProperties to user prefs.
- Adds a network preference kDeviceOpenNetworkProperties to local state.
- Both are lists of NetworkConfigurations according to the ONC spec.
- For now, only policies are written to these prefs.
- User settings continue to be stored in Shill for now. A follow up commit will change that too.
BUG=258835
TBR=mpcomplete@chromium.org (trivial change in chrome_direct_setting_api.h)
Review URL: https://chromiumcodereview.appspot.com/18348012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 9a08d81..14cc6a7 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -259,6 +259,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { chromeos::KioskAppManager::RegisterPrefs(registry); chromeos::LoginUtils::RegisterPrefs(registry); chromeos::Preferences::RegisterPrefs(registry); + chromeos::proxy_config::RegisterPrefs(registry); chromeos::RegisterDisplayLocalStatePrefs(registry); chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); |