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.h | |
| 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.h')
| -rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h index 9e63f7b..2d813ea 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.h +++ b/chrome/browser/chromeos/proxy_config_service_impl.h @@ -10,8 +10,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/prefs/pref_member.h" -#include "chrome/browser/chromeos/ui_proxy_config.h" -#include "chrome/browser/chromeos/ui_proxy_config_service.h" #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" #include "chromeos/network/network_state_handler_observer.h" #include "chromeos/network/onc/onc_constants.h" @@ -50,10 +48,6 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl, explicit ProxyConfigServiceImpl(PrefService* pref_service); virtual ~ProxyConfigServiceImpl(); - // Provide a service to the UI for proxy configuration. - // TODO(pneubeck): Ownership by this class is legacy and should be removed. - UIProxyConfigService& GetUIService(); - // PrefProxyConfigTrackerImpl implementation. virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state, const net::ProxyConfig& config) OVERRIDE; @@ -99,8 +93,6 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl, // Track changes in UseSharedProxies user preference. BooleanPrefMember use_shared_proxies_; - UIProxyConfigService ui_proxy_config_service_; - base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_; DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl); |