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

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: Rename delegate functions. 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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 proxy_info_ = used_proxy_info; 417 proxy_info_ = used_proxy_info;
418 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); 418 response_.was_npn_negotiated = stream_request_->was_npn_negotiated();
419 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString( 419 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString(
420 stream_request_->protocol_negotiated()); 420 stream_request_->protocol_negotiated());
421 response_.was_fetched_via_spdy = stream_request_->using_spdy(); 421 response_.was_fetched_via_spdy = stream_request_->using_spdy();
422 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); 422 response_.was_fetched_via_proxy = !proxy_info_.is_direct();
423 423
424 OnIOComplete(OK); 424 OnIOComplete(OK);
425 } 425 }
426 426
427 void HttpNetworkTransaction::OnSocketReadyForWebSocket(
428 const SSLConfig& used_ssl_config,
429 const ProxyInfo& used_proxy_info,
430 ClientSocketHandle* connection) {
431 NOTREACHED() << "This function should never be called.";
432 }
433
434 void HttpNetworkTransaction::OnSpdySessionReadyForWebSocket(
435 const SSLConfig& used_ssl_config,
436 const ProxyInfo& used_proxy_info,
437 SpdySession* session) {
438 NOTREACHED() << "This function should never be called.";
439 }
440
427 void HttpNetworkTransaction::OnStreamFailed(int result, 441 void HttpNetworkTransaction::OnStreamFailed(int result,
428 const SSLConfig& used_ssl_config) { 442 const SSLConfig& used_ssl_config) {
429 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_); 443 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_);
430 DCHECK_NE(OK, result); 444 DCHECK_NE(OK, result);
431 DCHECK(stream_request_.get()); 445 DCHECK(stream_request_.get());
432 DCHECK(!stream_.get()); 446 DCHECK(!stream_.get());
433 server_ssl_config_ = used_ssl_config; 447 server_ssl_config_ = used_ssl_config;
434 448
435 OnIOComplete(result); 449 OnIOComplete(result);
436 } 450 }
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1450 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1437 state); 1451 state);
1438 break; 1452 break;
1439 } 1453 }
1440 return description; 1454 return description;
1441 } 1455 }
1442 1456
1443 #undef STATE_CASE 1457 #undef STATE_CASE
1444 1458
1445 } // namespace net 1459 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698