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 "net/proxy/proxy_service.h" | 5 #include "net/proxy/proxy_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1385 } | 1385 } |
1386 } | 1386 } |
1387 | 1387 |
1388 net_log.EndEvent(NetLog::TYPE_PROXY_SERVICE); | 1388 net_log.EndEvent(NetLog::TYPE_PROXY_SERVICE); |
1389 return result_code; | 1389 return result_code; |
1390 } | 1390 } |
1391 | 1391 |
1392 void ProxyService::SetProxyScriptFetchers( | 1392 void ProxyService::SetProxyScriptFetchers( |
1393 ProxyScriptFetcher* proxy_script_fetcher, | 1393 ProxyScriptFetcher* proxy_script_fetcher, |
1394 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher) { | 1394 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher) { |
| 1395 // TODO(eroman): Remove once crbug.com/454983 is fixed. |
| 1396 tracked_objects::ScopedTracker tracking_profile( |
| 1397 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 1398 "454983 ProxyService::SetProxyScriptFetchers")); |
1395 DCHECK(CalledOnValidThread()); | 1399 DCHECK(CalledOnValidThread()); |
1396 State previous_state = ResetProxyConfig(false); | 1400 State previous_state = ResetProxyConfig(false); |
1397 proxy_script_fetcher_.reset(proxy_script_fetcher); | 1401 proxy_script_fetcher_.reset(proxy_script_fetcher); |
1398 dhcp_proxy_script_fetcher_.reset(dhcp_proxy_script_fetcher); | 1402 dhcp_proxy_script_fetcher_.reset(dhcp_proxy_script_fetcher); |
1399 if (previous_state != STATE_NONE) | 1403 if (previous_state != STATE_NONE) |
1400 ApplyProxyConfigIfAvailable(); | 1404 ApplyProxyConfigIfAvailable(); |
1401 } | 1405 } |
1402 | 1406 |
1403 ProxyScriptFetcher* ProxyService::GetProxyScriptFetcher() const { | 1407 ProxyScriptFetcher* ProxyService::GetProxyScriptFetcher() const { |
1404 DCHECK(CalledOnValidThread()); | 1408 DCHECK(CalledOnValidThread()); |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1609 State previous_state = ResetProxyConfig(false); | 1613 State previous_state = ResetProxyConfig(false); |
1610 if (previous_state != STATE_NONE) | 1614 if (previous_state != STATE_NONE) |
1611 ApplyProxyConfigIfAvailable(); | 1615 ApplyProxyConfigIfAvailable(); |
1612 } | 1616 } |
1613 | 1617 |
1614 void ProxyService::OnDNSChanged() { | 1618 void ProxyService::OnDNSChanged() { |
1615 OnIPAddressChanged(); | 1619 OnIPAddressChanged(); |
1616 } | 1620 } |
1617 | 1621 |
1618 } // namespace net | 1622 } // namespace net |
OLD | NEW |