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

Side by Side Diff: net/http/http_network_transaction.cc

Issue 1059843002: Refactor NetLog::LogLevel --> NetLogCaptureMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix a merge conflict Created 5 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/http/http_log_util_unittest.cc ('k') | net/http/http_network_transaction_unittest.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/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 alternate_protocol_values, 90 alternate_protocol_values,
91 http_host_port_pair, 91 http_host_port_pair,
92 *session); 92 *session);
93 } 93 }
94 94
95 base::Value* NetLogSSLVersionFallbackCallback( 95 base::Value* NetLogSSLVersionFallbackCallback(
96 const GURL* url, 96 const GURL* url,
97 int net_error, 97 int net_error,
98 uint16 version_before, 98 uint16 version_before,
99 uint16 version_after, 99 uint16 version_after,
100 NetLog::LogLevel /* log_level */) { 100 NetLogCaptureMode /* capture_mode */) {
101 base::DictionaryValue* dict = new base::DictionaryValue(); 101 base::DictionaryValue* dict = new base::DictionaryValue();
102 dict->SetString("host_and_port", GetHostAndPort(*url)); 102 dict->SetString("host_and_port", GetHostAndPort(*url));
103 dict->SetInteger("net_error", net_error); 103 dict->SetInteger("net_error", net_error);
104 dict->SetInteger("version_before", version_before); 104 dict->SetInteger("version_before", version_before);
105 dict->SetInteger("version_after", version_after); 105 dict->SetInteger("version_after", version_after);
106 return dict; 106 return dict;
107 } 107 }
108 108
109 base::Value* NetLogSSLCipherFallbackCallback(const GURL* url, 109 base::Value* NetLogSSLCipherFallbackCallback(
110 int net_error, 110 const GURL* url,
111 NetLog::LogLevel /* log_level */) { 111 int net_error,
112 NetLogCaptureMode /* capture_mode */) {
112 base::DictionaryValue* dict = new base::DictionaryValue(); 113 base::DictionaryValue* dict = new base::DictionaryValue();
113 dict->SetString("host_and_port", GetHostAndPort(*url)); 114 dict->SetString("host_and_port", GetHostAndPort(*url));
114 dict->SetInteger("net_error", net_error); 115 dict->SetInteger("net_error", net_error);
115 return dict; 116 return dict;
116 } 117 }
117 118
118 } // namespace 119 } // namespace
119 120
120 //----------------------------------------------------------------------------- 121 //-----------------------------------------------------------------------------
121 122
(...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1653 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1653 state); 1654 state);
1654 break; 1655 break;
1655 } 1656 }
1656 return description; 1657 return description;
1657 } 1658 }
1658 1659
1659 #undef STATE_CASE 1660 #undef STATE_CASE
1660 1661
1661 } // namespace net 1662 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_log_util_unittest.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698