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

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

Issue 333113002: Move data reduction proxy to Chrome-Proxy header for authentication (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@flywheel-refactor-net-fake-a-redirect-response-headers-chrome-proxy-auth
Patch Set: errata Created 6 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_cache_transaction.h ('k') | net/http/http_network_transaction.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_cache_transaction.h" 5 #include "net/http/http_cache_transaction.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(OS_POSIX) 9 #if defined(OS_POSIX)
10 #include <unistd.h> 10 #include <unistd.h>
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 if (network_trans_) 559 if (network_trans_)
560 network_trans_->SetWebSocketHandshakeStreamCreateHelper(create_helper); 560 network_trans_->SetWebSocketHandshakeStreamCreateHelper(create_helper);
561 } 561 }
562 562
563 void HttpCache::Transaction::SetBeforeNetworkStartCallback( 563 void HttpCache::Transaction::SetBeforeNetworkStartCallback(
564 const BeforeNetworkStartCallback& callback) { 564 const BeforeNetworkStartCallback& callback) {
565 DCHECK(!network_trans_); 565 DCHECK(!network_trans_);
566 before_network_start_callback_ = callback; 566 before_network_start_callback_ = callback;
567 } 567 }
568 568
569 void HttpCache::Transaction::SetBeforeProxyHeadersSentCallback(
570 const BeforeProxyHeadersSentCallback& callback) {
571 DCHECK(!network_trans_);
572 before_proxy_headers_sent_callback_ = callback;
573 }
574
569 int HttpCache::Transaction::ResumeNetworkStart() { 575 int HttpCache::Transaction::ResumeNetworkStart() {
570 if (network_trans_) 576 if (network_trans_)
571 return network_trans_->ResumeNetworkStart(); 577 return network_trans_->ResumeNetworkStart();
572 return ERR_UNEXPECTED; 578 return ERR_UNEXPECTED;
573 } 579 }
574 580
575 //----------------------------------------------------------------------------- 581 //-----------------------------------------------------------------------------
576 582
577 void HttpCache::Transaction::DoCallback(int rv) { 583 void HttpCache::Transaction::DoCallback(int rv) {
578 DCHECK(rv != ERR_IO_PENDING); 584 DCHECK(rv != ERR_IO_PENDING);
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 DCHECK(!network_trans_.get()); 893 DCHECK(!network_trans_.get());
888 894
889 send_request_since_ = TimeTicks::Now(); 895 send_request_since_ = TimeTicks::Now();
890 896
891 // Create a network transaction. 897 // Create a network transaction.
892 int rv = cache_->network_layer_->CreateTransaction(priority_, 898 int rv = cache_->network_layer_->CreateTransaction(priority_,
893 &network_trans_); 899 &network_trans_);
894 if (rv != OK) 900 if (rv != OK)
895 return rv; 901 return rv;
896 network_trans_->SetBeforeNetworkStartCallback(before_network_start_callback_); 902 network_trans_->SetBeforeNetworkStartCallback(before_network_start_callback_);
903 network_trans_->SetBeforeProxyHeadersSentCallback(
904 before_proxy_headers_sent_callback_);
897 905
898 // Old load timing information, if any, is now obsolete. 906 // Old load timing information, if any, is now obsolete.
899 old_network_trans_load_timing_.reset(); 907 old_network_trans_load_timing_.reset();
900 908
901 if (websocket_handshake_stream_base_create_helper_) 909 if (websocket_handshake_stream_base_create_helper_)
902 network_trans_->SetWebSocketHandshakeStreamCreateHelper( 910 network_trans_->SetWebSocketHandshakeStreamCreateHelper(
903 websocket_handshake_stream_base_create_helper_); 911 websocket_handshake_stream_base_create_helper_);
904 912
905 next_state_ = STATE_SEND_REQUEST_COMPLETE; 913 next_state_ = STATE_SEND_REQUEST_COMPLETE;
906 rv = network_trans_->Start(request_, io_callback_, net_log_); 914 rv = network_trans_->Start(request_, io_callback_, net_log_);
(...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after
2568 default: 2576 default:
2569 NOTREACHED(); 2577 NOTREACHED();
2570 } 2578 }
2571 } 2579 }
2572 2580
2573 void HttpCache::Transaction::OnIOComplete(int result) { 2581 void HttpCache::Transaction::OnIOComplete(int result) {
2574 DoLoop(result); 2582 DoLoop(result);
2575 } 2583 }
2576 2584
2577 } // namespace net 2585 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_cache_transaction.h ('k') | net/http/http_network_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698