| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 return PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(*proxy_dict, | 46 return PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(*proxy_dict, |
| 47 proxy_config); | 47 proxy_config); |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace | 50 } // namespace |
| 51 | 51 |
| 52 ProxyConfigServiceImpl::ProxyConfigServiceImpl(PrefService* profile_prefs, | 52 ProxyConfigServiceImpl::ProxyConfigServiceImpl(PrefService* profile_prefs, |
| 53 PrefService* local_state_prefs) | 53 PrefService* local_state_prefs) |
| 54 : PrefProxyConfigTrackerImpl( | 54 : PrefProxyConfigTrackerImpl( |
| 55 profile_prefs ? profile_prefs : local_state_prefs, | 55 profile_prefs ? profile_prefs : local_state_prefs, |
| 56 content::BrowserThread::GetMessageLoopProxyForThread( | 56 content::BrowserThread::GetTaskRunnerForThread( |
| 57 content::BrowserThread::IO)), | 57 content::BrowserThread::IO)), |
| 58 active_config_state_(ProxyPrefs::CONFIG_UNSET), | 58 active_config_state_(ProxyPrefs::CONFIG_UNSET), |
| 59 profile_prefs_(profile_prefs), | 59 profile_prefs_(profile_prefs), |
| 60 local_state_prefs_(local_state_prefs), | 60 local_state_prefs_(local_state_prefs), |
| 61 pointer_factory_(this) { | 61 pointer_factory_(this) { |
| 62 const base::Closure proxy_change_callback = base::Bind( | 62 const base::Closure proxy_change_callback = base::Bind( |
| 63 &ProxyConfigServiceImpl::OnProxyPrefChanged, base::Unretained(this)); | 63 &ProxyConfigServiceImpl::OnProxyPrefChanged, base::Unretained(this)); |
| 64 | 64 |
| 65 if (profile_prefs) { | 65 if (profile_prefs) { |
| 66 profile_pref_registrar_.Init(profile_prefs); | 66 profile_pref_registrar_.Init(profile_prefs); |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 std::unique_ptr<base::DictionaryValue> config_dict( | 243 std::unique_ptr<base::DictionaryValue> config_dict( |
| 244 effective_config.ToValue()); | 244 effective_config.ToValue()); |
| 245 VLOG(1) << this << ": Proxy changed: " | 245 VLOG(1) << this << ": Proxy changed: " |
| 246 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) | 246 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) |
| 247 << ", " << *config_dict; | 247 << ", " << *config_dict; |
| 248 } | 248 } |
| 249 } | 249 } |
| 250 } | 250 } |
| 251 | 251 |
| 252 } // namespace chromeos | 252 } // namespace chromeos |
| OLD | NEW |