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" | |
13 #include "base/values.h" | 12 #include "base/values.h" |
14 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 14 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
16 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
17 #include "chromeos/network/network_profile.h" | 16 #include "chromeos/network/network_profile.h" |
18 #include "chromeos/network/network_profile_handler.h" | 17 #include "chromeos/network/network_profile_handler.h" |
19 #include "chromeos/network/network_state.h" | 18 #include "chromeos/network/network_state.h" |
20 #include "chromeos/network/network_state_handler.h" | 19 #include "chromeos/network/network_state_handler.h" |
21 #include "chromeos/network/onc/onc_utils.h" | 20 #include "chromeos/network/onc/onc_utils.h" |
22 #include "components/policy/core/common/cloud/cloud_policy_constants.h" | 21 #include "components/policy/core/common/cloud/cloud_policy_constants.h" |
| 22 #include "components/prefs/pref_service.h" |
23 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" | 23 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" |
24 #include "components/proxy_config/proxy_config_dictionary.h" | 24 #include "components/proxy_config/proxy_config_dictionary.h" |
25 #include "components/proxy_config/proxy_prefs.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 #include "content/public/browser/browser_thread.h" | 27 #include "content/public/browser/browser_thread.h" |
28 | 28 |
29 namespace chromeos { | 29 namespace chromeos { |
30 | 30 |
31 namespace { | 31 namespace { |
32 | 32 |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful. | 242 if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful. |
243 scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue()); | 243 scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue()); |
244 VLOG(1) << this << ": Proxy changed: " | 244 VLOG(1) << this << ": Proxy changed: " |
245 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) | 245 << ProxyPrefs::ConfigStateToDebugString(active_config_state_) |
246 << ", " << *config_dict; | 246 << ", " << *config_dict; |
247 } | 247 } |
248 } | 248 } |
249 } | 249 } |
250 | 250 |
251 } // namespace chromeos | 251 } // namespace chromeos |
OLD | NEW |