diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 16:06:13 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 16:06:13 +0000 |
| commit | 1ee36bccbc029d184c63bb0cc924715c30663941 (patch) | |
| tree | 837ac4c769e8b526c0bbc3cf712bdd114302a351 /chrome/browser/chromeos/proxy_config_service_impl.cc | |
| parent | fed609fe1e0f3952503412d26b25c556eb578872 (diff) | |
| download | chromium_src-1ee36bccbc029d184c63bb0cc924715c30663941.zip chromium_src-1ee36bccbc029d184c63bb0cc924715c30663941.tar.gz chromium_src-1ee36bccbc029d184c63bb0cc924715c30663941.tar.bz2 | |
Fix ownership of proxy UI related state.
- stores proxy UI related state in the CoreChromeOSOptionsHandler, i.e. per open settings page.
- removes any dependency of ProxyConfigServiceImpl on proxy UI.
BUG=142370, 234982
Review URL: https://chromiumcodereview.appspot.com/15847003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_config_service_impl.cc')
| -rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 1f16936..de8684c 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -44,7 +44,6 @@ bool ParseProxyConfig(const base::DictionaryValue& pref_proxy_config, ProxyConfigServiceImpl::ProxyConfigServiceImpl(PrefService* pref_service) : PrefProxyConfigTrackerImpl(pref_service), active_config_state_(ProxyPrefs::CONFIG_UNSET), - ui_proxy_config_service_(pref_service), pointer_factory_(this) { // Register for notifications of UseSharedProxies user preference. @@ -67,10 +66,6 @@ ProxyConfigServiceImpl::~ProxyConfigServiceImpl() { NetworkHandler::Get()->network_state_handler()->RemoveObserver(this); } -UIProxyConfigService& ProxyConfigServiceImpl::GetUIService() { - return ui_proxy_config_service_; -} - void ProxyConfigServiceImpl::OnProxyConfigChanged( ProxyPrefs::ConfigState config_state, const net::ProxyConfig& config) { |