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" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 15 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
16 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 16 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
17 #include "chrome/browser/prefs/proxy_config_dictionary.h" | |
18 #include "chrome/browser/prefs/proxy_prefs.h" | |
19 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
20 #include "chromeos/network/network_profile.h" | 18 #include "chromeos/network/network_profile.h" |
21 #include "chromeos/network/network_profile_handler.h" | 19 #include "chromeos/network/network_profile_handler.h" |
22 #include "chromeos/network/network_state.h" | 20 #include "chromeos/network/network_state.h" |
23 #include "chromeos/network/network_state_handler.h" | 21 #include "chromeos/network/network_state_handler.h" |
24 #include "chromeos/network/onc/onc_utils.h" | 22 #include "chromeos/network/onc/onc_utils.h" |
25 #include "components/policy/core/common/cloud/cloud_policy_constants.h" | 23 #include "components/policy/core/common/cloud/cloud_policy_constants.h" |
| 24 #include "components/proxy_config/proxy_config_dictionary.h" |
| 25 #include "components/proxy_config/proxy_prefs.h" |
26 #include "components/user_manager/user_manager.h" | 26 #include "components/user_manager/user_manager.h" |
27 | 27 |
28 namespace chromeos { | 28 namespace chromeos { |
29 | 29 |
30 namespace { | 30 namespace { |
31 | 31 |
32 // Writes the proxy config of |network| to |proxy_config|. Set |onc_source| to | 32 // Writes the proxy config of |network| to |proxy_config|. Set |onc_source| to |
33 // the source of this configuration. Returns false if no | 33 // the source of this configuration. Returns false if no |
34 // proxy was configured for this network. | 34 // proxy was configured for this network. |
35 bool GetProxyConfig(const PrefService* profile_prefs, | 35 bool GetProxyConfig(const PrefService* profile_prefs, |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful. | 232 if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful. |
233 scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue()); | 233 scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue()); |
234 VLOG(1) << this << ": Proxy changed: " | 234 VLOG(1) << this << ": Proxy changed: " |
235 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) | 235 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) |
236 << ", " << *config_dict; | 236 << ", " << *config_dict; |
237 } | 237 } |
238 } | 238 } |
239 } | 239 } |
240 | 240 |
241 } // namespace chromeos | 241 } // namespace chromeos |
OLD | NEW |