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

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

Issue 1122483004: Remove NetLog::GetCaptureMode() and NetLogCaptureMode::None() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mmenke_refactor
Patch Set: second attempt at fixing int --> bool warning on windows Created 5 years, 7 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 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
1373 int result_code, 1373 int result_code,
1374 const BoundNetLog& net_log) { 1374 const BoundNetLog& net_log) {
1375 // Log the result of the proxy resolution. 1375 // Log the result of the proxy resolution.
1376 if (result_code == OK) { 1376 if (result_code == OK) {
1377 // Allow the network delegate to interpose on the resolution decision, 1377 // Allow the network delegate to interpose on the resolution decision,
1378 // possibly modifying the ProxyInfo. 1378 // possibly modifying the ProxyInfo.
1379 if (network_delegate) 1379 if (network_delegate)
1380 network_delegate->NotifyResolveProxy(url, load_flags, *this, result); 1380 network_delegate->NotifyResolveProxy(url, load_flags, *this, result);
1381 1381
1382 // When logging all events is enabled, dump the proxy list. 1382 // When logging all events is enabled, dump the proxy list.
1383 if (net_log.GetCaptureMode().enabled()) { 1383 if (net_log.IsCapturing()) {
1384 net_log.AddEvent( 1384 net_log.AddEvent(
1385 NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST, 1385 NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST,
1386 base::Bind(&NetLogFinishedResolvingProxyCallback, result)); 1386 base::Bind(&NetLogFinishedResolvingProxyCallback, result));
1387 } 1387 }
1388 result->DeprioritizeBadProxies(proxy_retry_info_); 1388 result->DeprioritizeBadProxies(proxy_retry_info_);
1389 } else { 1389 } else {
1390 net_log.AddEventWithNetErrorCode( 1390 net_log.AddEventWithNetErrorCode(
1391 NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST, result_code); 1391 NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST, result_code);
1392 1392
1393 bool reset_config = result_code == ERR_PAC_SCRIPT_TERMINATED; 1393 bool reset_config = result_code == ERR_PAC_SCRIPT_TERMINATED;
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 State previous_state = ResetProxyConfig(false); 1631 State previous_state = ResetProxyConfig(false);
1632 if (previous_state != STATE_NONE) 1632 if (previous_state != STATE_NONE)
1633 ApplyProxyConfigIfAvailable(); 1633 ApplyProxyConfigIfAvailable();
1634 } 1634 }
1635 1635
1636 void ProxyService::OnDNSChanged() { 1636 void ProxyService::OnDNSChanged() {
1637 OnIPAddressChanged(); 1637 OnIPAddressChanged();
1638 } 1638 }
1639 1639
1640 } // namespace net 1640 } // namespace net
OLDNEW
« no previous file with comments | « net/log/write_to_file_net_log_observer_unittest.cc ('k') | net/socket/transport_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698