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

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

Issue 14813024: Introduce RequestWebSocketStream into HttpStreamFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a comment. Created 7 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/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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 proxy_info_ = used_proxy_info; 418 proxy_info_ = used_proxy_info;
419 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); 419 response_.was_npn_negotiated = stream_request_->was_npn_negotiated();
420 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString( 420 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString(
421 stream_request_->protocol_negotiated()); 421 stream_request_->protocol_negotiated());
422 response_.was_fetched_via_spdy = stream_request_->using_spdy(); 422 response_.was_fetched_via_spdy = stream_request_->using_spdy();
423 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); 423 response_.was_fetched_via_proxy = !proxy_info_.is_direct();
424 424
425 OnIOComplete(OK); 425 OnIOComplete(OK);
426 } 426 }
427 427
428 void HttpNetworkTransaction::OnSocketReady(const SSLConfig& used_ssl_config,
Adam Rice 2013/05/13 13:03:03 I think this implementation of OnSocketReady() and
yhirano 2013/05/14 05:43:53 You are right, done.
429 const ProxyInfo& used_proxy_info,
430 ClientSocketHandle* connection) {
431 }
432
433 void HttpNetworkTransaction::OnSpdySessionReady(
434 const SSLConfig& used_ssl_config,
435 const ProxyInfo& used_proxy_info,
436 SpdySession* session) {
437 }
438
428 void HttpNetworkTransaction::OnStreamFailed(int result, 439 void HttpNetworkTransaction::OnStreamFailed(int result,
429 const SSLConfig& used_ssl_config) { 440 const SSLConfig& used_ssl_config) {
430 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_); 441 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_);
431 DCHECK_NE(OK, result); 442 DCHECK_NE(OK, result);
432 DCHECK(stream_request_.get()); 443 DCHECK(stream_request_.get());
433 DCHECK(!stream_.get()); 444 DCHECK(!stream_.get());
434 server_ssl_config_ = used_ssl_config; 445 server_ssl_config_ = used_ssl_config;
435 446
436 OnIOComplete(result); 447 OnIOComplete(result);
437 } 448 }
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1438 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1428 state); 1439 state);
1429 break; 1440 break;
1430 } 1441 }
1431 return description; 1442 return description;
1432 } 1443 }
1433 1444
1434 #undef STATE_CASE 1445 #undef STATE_CASE
1435 1446
1436 } // namespace net 1447 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698