net/http/http_network_transaction.cc - Issue 10399083: Make NetLog take in callbacks that return Values

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_network_transaction.cc

Issue 10399083: Make NetLog take in callbacks that return Values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Fix merge error Created 8 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:

Index: net/http/http_network_transaction.cc

===================================================================

--- net/http/http_network_transaction.cc (revision 141317)

+++ net/http/http_network_transaction.cc (working copy)

@@ -36,7 +36,6 @@

#include "net/http/http_auth_handler_factory.h"

#include "net/http/http_basic_stream.h"

#include "net/http/http_chunked_decoder.h"

-#include "net/http/http_net_log_params.h"

#include "net/http/http_network_session.h"

#include "net/http/http_proxy_client_socket.h"

#include "net/http/http_proxy_client_socket_pool.h"

@@ -872,11 +871,9 @@

"Net.HttpResponseCode_Nxx_MainFrame", response_code/100, 10);

}

- if (net_log_.IsLoggingAllEvents()) {

- net_log_.AddEvent(

- NetLog::TYPE_HTTP_TRANSACTION_READ_RESPONSE_HEADERS,

- make_scoped_refptr(new NetLogHttpResponseParameter(response_.headers)));

- }

+ net_log_.AddEvent(

+ NetLog::TYPE_HTTP_TRANSACTION_READ_RESPONSE_HEADERS,

+ base::Bind(&HttpResponseHeaders::NetLogCallback, response_.headers));

if (response_.headers->GetParsedHttpVersion() < HttpVersion(1, 0)) {

// HTTP/0.9 doesn't support the PUT method, so lack of response headers

« no previous file with comments | « net/http/http_net_log_params.cc ('k') | net/http/http_network_transaction_spdy2_unittest.cc » ('j') | no next file with comments »