Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Side by Side Diff: net/proxy/proxy_service.cc

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/proxy/proxy_server.cc ('k') | net/proxy/proxy_service_mojo.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/message_loop/message_loop_proxy.h"
16 #include "base/metrics/histogram_macros.h" 15 #include "base/metrics/histogram_macros.h"
17 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
18 #include "base/thread_task_runner_handle.h" 17 #include "base/thread_task_runner_handle.h"
19 #include "base/time/time.h" 18 #include "base/time/time.h"
20 #include "base/values.h" 19 #include "base/values.h"
21 #include "net/base/completion_callback.h" 20 #include "net/base/completion_callback.h"
22 #include "net/base/load_flags.h" 21 #include "net/base/load_flags.h"
23 #include "net/base/net_errors.h" 22 #include "net/base/net_errors.h"
24 #include "net/base/net_util.h" 23 #include "net/base/net_util.h"
25 #include "net/log/net_log.h" 24 #include "net/log/net_log.h"
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 // Synchronously fetch the current proxy config (since we are running on 1532 // Synchronously fetch the current proxy config (since we are running on
1534 // glib_default_loop). Additionally register for notifications (delivered in 1533 // glib_default_loop). Additionally register for notifications (delivered in
1535 // either |glib_default_loop| or |file_task_runner|) to keep us updated when 1534 // either |glib_default_loop| or |file_task_runner|) to keep us updated when
1536 // the proxy config changes. 1535 // the proxy config changes.
1537 linux_config_service->SetupAndFetchInitialConfig( 1536 linux_config_service->SetupAndFetchInitialConfig(
1538 glib_thread_task_runner, io_task_runner, file_task_runner); 1537 glib_thread_task_runner, io_task_runner, file_task_runner);
1539 1538
1540 return linux_config_service; 1539 return linux_config_service;
1541 #elif defined(OS_ANDROID) 1540 #elif defined(OS_ANDROID)
1542 return new ProxyConfigServiceAndroid( 1541 return new ProxyConfigServiceAndroid(
1543 io_task_runner, base::MessageLoop::current()->message_loop_proxy()); 1542 io_task_runner, base::MessageLoop::current()->task_runner());
1544 #else 1543 #else
1545 LOG(WARNING) << "Failed to choose a system proxy settings fetcher " 1544 LOG(WARNING) << "Failed to choose a system proxy settings fetcher "
1546 "for this platform."; 1545 "for this platform.";
1547 return new ProxyConfigServiceDirect(); 1546 return new ProxyConfigServiceDirect();
1548 #endif 1547 #endif
1549 } 1548 }
1550 1549
1551 // static 1550 // static
1552 const ProxyService::PacPollPolicy* ProxyService::set_pac_script_poll_policy( 1551 const ProxyService::PacPollPolicy* ProxyService::set_pac_script_poll_policy(
1553 const PacPollPolicy* policy) { 1552 const PacPollPolicy* policy) {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 State previous_state = ResetProxyConfig(false); 1655 State previous_state = ResetProxyConfig(false);
1657 if (previous_state != STATE_NONE) 1656 if (previous_state != STATE_NONE)
1658 ApplyProxyConfigIfAvailable(); 1657 ApplyProxyConfigIfAvailable();
1659 } 1658 }
1660 1659
1661 void ProxyService::OnDNSChanged() { 1660 void ProxyService::OnDNSChanged() {
1662 OnIPAddressChanged(); 1661 OnIPAddressChanged();
1663 } 1662 }
1664 1663
1665 } // namespace net 1664 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_server.cc ('k') | net/proxy/proxy_service_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698