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 #include <cmath> | 8 #include <cmath> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1516 | 1516 |
1517 void ProxyService::ForceReloadProxyConfig() { | 1517 void ProxyService::ForceReloadProxyConfig() { |
1518 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); | 1518 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); |
1519 ResetProxyConfig(false); | 1519 ResetProxyConfig(false); |
1520 ApplyProxyConfigIfAvailable(); | 1520 ApplyProxyConfigIfAvailable(); |
1521 } | 1521 } |
1522 | 1522 |
1523 // static | 1523 // static |
1524 std::unique_ptr<ProxyConfigService> | 1524 std::unique_ptr<ProxyConfigService> |
1525 ProxyService::CreateSystemProxyConfigService( | 1525 ProxyService::CreateSystemProxyConfigService( |
1526 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) { | 1526 const scoped_refptr<base::SequencedTaskRunner>& io_task_runner) { |
1527 #if defined(OS_WIN) | 1527 #if defined(OS_WIN) |
1528 return base::MakeUnique<ProxyConfigServiceWin>(); | 1528 return base::MakeUnique<ProxyConfigServiceWin>(); |
1529 #elif defined(OS_IOS) | 1529 #elif defined(OS_IOS) |
1530 return base::MakeUnique<ProxyConfigServiceIOS>(); | 1530 return base::MakeUnique<ProxyConfigServiceIOS>(); |
1531 #elif defined(OS_MACOSX) | 1531 #elif defined(OS_MACOSX) |
1532 return base::MakeUnique<ProxyConfigServiceMac>(io_task_runner); | 1532 return base::MakeUnique<ProxyConfigServiceMac>(io_task_runner); |
1533 #elif defined(OS_CHROMEOS) | 1533 #elif defined(OS_CHROMEOS) |
1534 LOG(ERROR) << "ProxyConfigService for ChromeOS should be created in " | 1534 LOG(ERROR) << "ProxyConfigService for ChromeOS should be created in " |
1535 << "profile_io_data.cc::CreateProxyConfigService and this should " | 1535 << "profile_io_data.cc::CreateProxyConfigService and this should " |
1536 << "be used only for examples."; | 1536 << "be used only for examples."; |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1671 State previous_state = ResetProxyConfig(false); | 1671 State previous_state = ResetProxyConfig(false); |
1672 if (previous_state != STATE_NONE) | 1672 if (previous_state != STATE_NONE) |
1673 ApplyProxyConfigIfAvailable(); | 1673 ApplyProxyConfigIfAvailable(); |
1674 } | 1674 } |
1675 | 1675 |
1676 void ProxyService::OnDNSChanged() { | 1676 void ProxyService::OnDNSChanged() { |
1677 OnIPAddressChanged(); | 1677 OnIPAddressChanged(); |
1678 } | 1678 } |
1679 | 1679 |
1680 } // namespace net | 1680 } // namespace net |
OLD | NEW |