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

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

Issue 15662008: Make net and ipc explicitly use the base namespace for Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_network_transaction_spdy2_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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 case ERR_BAD_SSL_CLIENT_AUTH_CERT: 89 case ERR_BAD_SSL_CLIENT_AUTH_CERT:
90 case ERR_SSL_CLIENT_AUTH_PRIVATE_KEY_ACCESS_DENIED: 90 case ERR_SSL_CLIENT_AUTH_PRIVATE_KEY_ACCESS_DENIED:
91 case ERR_SSL_CLIENT_AUTH_CERT_NO_PRIVATE_KEY: 91 case ERR_SSL_CLIENT_AUTH_CERT_NO_PRIVATE_KEY:
92 case ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED: 92 case ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED:
93 return true; 93 return true;
94 default: 94 default:
95 return false; 95 return false;
96 } 96 }
97 } 97 }
98 98
99 Value* NetLogSSLVersionFallbackCallback(const GURL* url, 99 base::Value* NetLogSSLVersionFallbackCallback(
100 int net_error, 100 const GURL* url,
101 uint16 version_before, 101 int net_error,
102 uint16 version_after, 102 uint16 version_before,
103 NetLog::LogLevel /* log_level */) { 103 uint16 version_after,
104 DictionaryValue* dict = new DictionaryValue(); 104 NetLog::LogLevel /* log_level */) {
105 base::DictionaryValue* dict = new base::DictionaryValue();
105 dict->SetString("host_and_port", GetHostAndPort(*url)); 106 dict->SetString("host_and_port", GetHostAndPort(*url));
106 dict->SetInteger("net_error", net_error); 107 dict->SetInteger("net_error", net_error);
107 dict->SetInteger("version_before", version_before); 108 dict->SetInteger("version_before", version_before);
108 dict->SetInteger("version_after", version_after); 109 dict->SetInteger("version_after", version_after);
109 return dict; 110 return dict;
110 } 111 }
111 112
112 } // namespace 113 } // namespace
113 114
114 //----------------------------------------------------------------------------- 115 //-----------------------------------------------------------------------------
(...skipping 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1446 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1446 state); 1447 state);
1447 break; 1448 break;
1448 } 1449 }
1449 return description; 1450 return description;
1450 } 1451 }
1451 1452
1452 #undef STATE_CASE 1453 #undef STATE_CASE
1453 1454
1454 } // namespace net 1455 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_network_transaction_spdy2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698