OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <ostream> | 7 #include <ostream> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
11 #include "base/task.h" | 11 #include "base/task.h" |
12 #include "chrome/browser/browser_thread.h" | |
13 #include "chrome/browser/chromeos/cros/cros_library.h" | 12 #include "chrome/browser/chromeos/cros/cros_library.h" |
14 #include "chrome/common/json_value_serializer.h" | 13 #include "chrome/common/json_value_serializer.h" |
| 14 #include "content/browser/browser_thread.h" |
15 | 15 |
16 namespace chromeos { | 16 namespace chromeos { |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 const char* SourceToString(ProxyConfigServiceImpl::ProxyConfig::Source source) { | 20 const char* SourceToString(ProxyConfigServiceImpl::ProxyConfig::Source source) { |
21 switch (source) { | 21 switch (source) { |
22 case ProxyConfigServiceImpl::ProxyConfig::SOURCE_NONE: | 22 case ProxyConfigServiceImpl::ProxyConfig::SOURCE_NONE: |
23 return "SOURCE_NONE"; | 23 return "SOURCE_NONE"; |
24 case ProxyConfigServiceImpl::ProxyConfig::SOURCE_POLICY: | 24 case ProxyConfigServiceImpl::ProxyConfig::SOURCE_POLICY: |
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 has_config_ = true; | 619 has_config_ = true; |
620 cached_config_ = new_config; | 620 cached_config_ = new_config; |
621 // Notify observers of new proxy config. | 621 // Notify observers of new proxy config. |
622 net::ProxyConfig net_config; | 622 net::ProxyConfig net_config; |
623 cached_config_.ToNetProxyConfig(&net_config); | 623 cached_config_.ToNetProxyConfig(&net_config); |
624 FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_, | 624 FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_, |
625 OnProxyConfigChanged(net_config)); | 625 OnProxyConfigChanged(net_config)); |
626 } | 626 } |
627 | 627 |
628 } // namespace chromeos | 628 } // namespace chromeos |
OLD | NEW |