diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 13:01:38 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 13:01:38 +0000 |
| commit | 0703a7904a31de405530fcc2edc8b17cba5d2892 (patch) | |
| tree | 862f13d037d26af29269afc91ddba31630cd1631 /chrome/browser/chromeos/ui_proxy_config_service.cc | |
| parent | 9bf87d41666719e9c6ea23a0bcc72036ff2f0c99 (diff) | |
| download | chromium_src-0703a7904a31de405530fcc2edc8b17cba5d2892.zip chromium_src-0703a7904a31de405530fcc2edc8b17cba5d2892.tar.gz chromium_src-0703a7904a31de405530fcc2edc8b17cba5d2892.tar.bz2 | |
Removing unused code for policies recommending proxy settings.
The implementation was incomplete as well: The user's proxy settings would have been overwritten on the next policy application.
BUG=NONE
TBR=mnissler@chromium.org
Review URL: https://codereview.chromium.org/16408008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/ui_proxy_config_service.cc')
| -rw-r--r-- | chrome/browser/chromeos/ui_proxy_config_service.cc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/chrome/browser/chromeos/ui_proxy_config_service.cc b/chrome/browser/chromeos/ui_proxy_config_service.cc index 5b1935e..17f11bd 100644 --- a/chrome/browser/chromeos/ui_proxy_config_service.cc +++ b/chrome/browser/chromeos/ui_proxy_config_service.cc @@ -9,7 +9,6 @@ #include "base/values.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" -#include "chrome/browser/chromeos/cros/network_property_ui_data.h" #include "chrome/browser/chromeos/proxy_config_service_impl.h" #include "chromeos/network/onc/onc_utils.h" #include "grit/generated_resources.h" @@ -68,18 +67,9 @@ bool ParseProxyConfig(const std::string& pref_proxy_config, // Returns true if proxy settings of |network| are editable. bool IsNetworkProxySettingsEditable(const Network& network) { - NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary(); - const base::DictionaryValue* onc = - network_library->FindOncForNetwork(network.unique_id()); - if (!onc) - return true; - - NetworkPropertyUIData proxy_settings_ui_data; - proxy_settings_ui_data.ParseOncProperty( - network.ui_data().onc_source(), - onc, - onc::network_config::kProxySettings); - return proxy_settings_ui_data.IsEditable(); + onc::ONCSource source = network.ui_data().onc_source(); + return source != onc::ONC_SOURCE_DEVICE_POLICY && + source != onc::ONC_SOURCE_USER_POLICY; } } // namespace |