From 637a7f18bb59338af71885b36ce5db96eebbb5af Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Thu, 15 Nov 2012 14:39:08 +0000 Subject: Remove PrefObserver usages, batch 5. TBR=cbentzel@chromium.org,achuith@chromium.org,bauerb@chromium.org,jhawkins@chromium.org,ivankr@chromium.org BUG=155525 Review URL: https://chromiumcodereview.appspot.com/11359209 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167916 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/chromeos/proxy_config_service_impl.cc | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'chrome/browser/chromeos/proxy_config_service_impl.cc') diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 5eca442..0e21f47 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -387,8 +387,12 @@ ProxyConfigServiceImpl::ProxyConfigServiceImpl(PrefService* pref_service) pointer_factory_(this) { // Register for notifications of UseSharedProxies user preference. - if (pref_service->FindPreference(prefs::kUseSharedProxies)) - use_shared_proxies_.Init(prefs::kUseSharedProxies, pref_service, this); + if (pref_service->FindPreference(prefs::kUseSharedProxies)) { + use_shared_proxies_.Init( + prefs::kUseSharedProxies, pref_service, + base::Bind(&ProxyConfigServiceImpl::OnUseSharedProxiesChanged, + base::Unretained(this))); + } FetchProxyPolicy(); @@ -586,26 +590,19 @@ void ProxyConfigServiceImpl::RegisterPrefs(PrefService* pref_service) { //------------------ ProxyConfigServiceImpl: private methods ------------------- -void ProxyConfigServiceImpl::OnPreferenceChanged(PrefServiceBase* service, - const std::string& pref_name) { - DCHECK(service == prefs()); +void ProxyConfigServiceImpl::OnUseSharedProxiesChanged() { VLOG(1) << "New use-shared-proxies = " << GetUseSharedProxies(); - if (pref_name == prefs::kUseSharedProxies) { - // Determine new proxy config which may have changed because of new - // use-shared-proxies. If necessary, activate it. - Network* network = NULL; - if (!active_network_.empty()) { - network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath( - active_network_); - if (!network) - LOG(WARNING) << "Can't find requested network " << active_network_; - } - DetermineEffectiveConfig(network, true); - return; + // Determine new proxy config which may have changed because of new + // use-shared-proxies. If necessary, activate it. + Network* network = NULL; + if (!active_network_.empty()) { + network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath( + active_network_); + if (!network) + LOG(WARNING) << "Can't find requested network " << active_network_; } - - PrefProxyConfigTrackerImpl::OnPreferenceChanged(service, pref_name); + DetermineEffectiveConfig(network, true); } void ProxyConfigServiceImpl::OnUISetProxyConfig() { -- cgit v1.1