diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 21:07:53 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 21:07:53 +0000 |
| commit | e5ed56ebda5c89cdb26eb6a7c31b41d2a4fd321b (patch) | |
| tree | ac7a2418f316a497081ebf9ab86a46dba202ccbb /chrome/browser/chromeos/policy/user_network_configuration_updater.cc | |
| parent | dc6097a75946a1d8ec46cd8fd4773fe5bf19af9f (diff) | |
| download | chromium_src-e5ed56ebda5c89cdb26eb6a7c31b41d2a4fd321b.zip chromium_src-e5ed56ebda5c89cdb26eb6a7c31b41d2a4fd321b.tar.gz chromium_src-e5ed56ebda5c89cdb26eb6a7c31b41d2a4fd321b.tar.bz2 | |
Autoconnect policy for CrOS.
This adds an autoconnect policy that disables autoconnect of unmanaged networks. As a device policy this applies to all shared networks. As a user policy it applies to all networks of this user.
With this commit the policy is applied on each restart and login. UI lockdown is still missing.
Configurations affecting several networks were not supported previously by ONC. Therefore, this commit adds the new toplevel section "GlobalNetworkConfiguration" to ONC.
BUG=280146
For API change:
R=bartfab@chromium.org
TBR=eroman@chromium.org
Review URL: https://codereview.chromium.org/23526016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/policy/user_network_configuration_updater.cc')
| -rw-r--r-- | chrome/browser/chromeos/policy/user_network_configuration_updater.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc index 990f5bd..49c2552 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc @@ -76,12 +76,15 @@ void UserNetworkConfigurationUpdater::ImportCertificates( } void UserNetworkConfigurationUpdater::ApplyNetworkPolicy( - base::ListValue* network_configs_onc) { + base::ListValue* network_configs_onc, + base::DictionaryValue* global_network_config) { DCHECK(user_); chromeos::onc::ExpandStringPlaceholdersInNetworksForUser(user_, network_configs_onc); - network_config_handler_->SetPolicy( - onc_source_, user_->username_hash(), *network_configs_onc); + network_config_handler_->SetPolicy(onc_source_, + user_->username_hash(), + *network_configs_onc, + *global_network_config); } void UserNetworkConfigurationUpdater::SetTrustAnchors() { |