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

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: 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
« no previous file with comments | « net/http/http_network_transaction.h ('k') | net/http/http_stream_factory.h » ('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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 proxy_info_ = used_proxy_info; 425 proxy_info_ = used_proxy_info;
426 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); 426 response_.was_npn_negotiated = stream_request_->was_npn_negotiated();
427 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString( 427 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString(
428 stream_request_->protocol_negotiated()); 428 stream_request_->protocol_negotiated());
429 response_.was_fetched_via_spdy = stream_request_->using_spdy(); 429 response_.was_fetched_via_spdy = stream_request_->using_spdy();
430 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); 430 response_.was_fetched_via_proxy = !proxy_info_.is_direct();
431 431
432 OnIOComplete(OK); 432 OnIOComplete(OK);
433 } 433 }
434 434
435 void HttpNetworkTransaction::OnWebSocketStreamReady(
436 const SSLConfig& used_ssl_config,
437 const ProxyInfo& used_proxy_info,
438 WebSocketStreamBase* stream) {
439 NOTREACHED() << "This function should never be called.";
440 }
441
435 void HttpNetworkTransaction::OnStreamFailed(int result, 442 void HttpNetworkTransaction::OnStreamFailed(int result,
436 const SSLConfig& used_ssl_config) { 443 const SSLConfig& used_ssl_config) {
437 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_); 444 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_);
438 DCHECK_NE(OK, result); 445 DCHECK_NE(OK, result);
439 DCHECK(stream_request_.get()); 446 DCHECK(stream_request_.get());
440 DCHECK(!stream_.get()); 447 DCHECK(!stream_.get());
441 server_ssl_config_ = used_ssl_config; 448 server_ssl_config_ = used_ssl_config;
442 449
443 OnIOComplete(result); 450 OnIOComplete(result);
444 } 451 }
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1452 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1446 state); 1453 state);
1447 break; 1454 break;
1448 } 1455 }
1449 return description; 1456 return description;
1450 } 1457 }
1451 1458
1452 #undef STATE_CASE 1459 #undef STATE_CASE
1453 1460
1454 } // namespace net 1461 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.h ('k') | net/http/http_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698