chrome/browser/net/load_timing_observer.cc - Issue 8680036: Move ResourceResponse struct into the Content API, since it's used in Chrome. While at it, I also...

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: chrome/browser/net/load_timing_observer.cc

Issue 8680036: Move ResourceResponse struct into the Content API, since it's used in Chrome. While at it, I also... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: add gypi changes Created 9 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/net/load_timing_observer.h ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/load_timing_observer.cc

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

--- chrome/browser/net/load_timing_observer.cc (revision 111374)

+++ chrome/browser/net/load_timing_observer.cc (working copy)

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

#include "base/time.h"

#include "chrome/browser/net/chrome_net_log.h"

-#include "content/common/resource_response.h"

+#include "content/public/common/resource_response.h"

#include "content/public/browser/browser_thread.h"

#include "net/base/load_flags.h"

#include "net/url_request/url_request.h"

@@ -99,8 +99,9 @@

}

// static

-void LoadTimingObserver::PopulateTimingInfo(net::URLRequest* request,

- ResourceResponse* response) {

+void LoadTimingObserver::PopulateTimingInfo(

+ net::URLRequest* request,

+ content::ResourceResponse* response) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

if (!(request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING))

return;

@@ -115,9 +116,9 @@

LoadTimingObserver::URLRequestRecord* record =

observer->GetURLRequestRecord(source_id);

if (record) {

- response->response_head.connection_id = record->socket_log_id;

- response->response_head.connection_reused = record->socket_reused;

- response->response_head.load_timing = record->timing;

+ response->connection_id = record->socket_log_id;

+ response->connection_reused = record->socket_reused;

+ response->load_timing = record->timing;

}