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

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

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 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
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 #include <cmath> 8 #include <cmath>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/memory/ptr_util.h" 17 #include "base/memory/ptr_util.h"
18 #include "base/memory/weak_ptr.h" 18 #include "base/memory/weak_ptr.h"
19 #include "base/metrics/histogram_macros.h" 19 #include "base/metrics/histogram_macros.h"
20 #include "base/metrics/sparse_histogram.h" 20 #include "base/metrics/sparse_histogram.h"
21 #include "base/single_thread_task_runner.h" 21 #include "base/single_thread_task_runner.h"
22 #include "base/strings/string_util.h" 22 #include "base/strings/string_util.h"
23 #include "base/threading/thread_task_runner_handle.h" 23 #include "base/threading/thread_task_runner_handle.h"
24 #include "base/time/time.h" 24 #include "base/time/time.h"
25 #include "base/values.h" 25 #include "base/values.h"
26 #include "net/base/completion_callback.h" 26 #include "net/base/completion_callback.h"
27 #include "net/base/net_errors.h" 27 #include "net/base/net_errors.h"
28 #include "net/base/proxy_delegate.h" 28 #include "net/base/proxy_delegate.h"
29 #include "net/base/url_util.h" 29 #include "net/base/url_util.h"
30 #include "net/log/net_log.h" 30 #include "net/log/net_log_capture_mode.h"
31 #include "net/log/net_log_event_type.h" 31 #include "net/log/net_log_event_type.h"
32 #include "net/log/net_log_with_source.h"
32 #include "net/proxy/dhcp_proxy_script_fetcher.h" 33 #include "net/proxy/dhcp_proxy_script_fetcher.h"
33 #include "net/proxy/multi_threaded_proxy_resolver.h" 34 #include "net/proxy/multi_threaded_proxy_resolver.h"
34 #include "net/proxy/proxy_config_service_fixed.h" 35 #include "net/proxy/proxy_config_service_fixed.h"
35 #include "net/proxy/proxy_resolver.h" 36 #include "net/proxy/proxy_resolver.h"
36 #include "net/proxy/proxy_resolver_factory.h" 37 #include "net/proxy/proxy_resolver_factory.h"
37 #include "net/proxy/proxy_script_decider.h" 38 #include "net/proxy/proxy_script_decider.h"
38 #include "net/proxy/proxy_script_fetcher.h" 39 #include "net/proxy/proxy_script_fetcher.h"
39 #include "net/url_request/url_request_context.h" 40 #include "net/url_request/url_request_context.h"
40 #include "url/gurl.h" 41 #include "url/gurl.h"
41 42
(...skipping 1628 matching lines...) Expand 10 before | Expand all | Expand 10 after
1670 State previous_state = ResetProxyConfig(false); 1671 State previous_state = ResetProxyConfig(false);
1671 if (previous_state != STATE_NONE) 1672 if (previous_state != STATE_NONE)
1672 ApplyProxyConfigIfAvailable(); 1673 ApplyProxyConfigIfAvailable();
1673 } 1674 }
1674 1675
1675 void ProxyService::OnDNSChanged() { 1676 void ProxyService::OnDNSChanged() {
1676 OnIPAddressChanged(); 1677 OnIPAddressChanged();
1677 } 1678 }
1678 1679
1679 } // namespace net 1680 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698