content/browser/loader/resource_loader.h - Issue 1130343006: Don't share ResourceDispatcherHostImpl's timer for reporting upload progress.

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: content/browser/loader/resource_loader.h

Issue 1130343006: Don't share ResourceDispatcherHostImpl's timer for reporting upload progress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@safari-backend

Patch Set: Fixes for mmenke Created 5 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 side-by-side diff with in-line comments

Download patch

« content/browser/loader/resource_dispatcher_host_impl.cc ('K') | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/browser/loader/resource_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/loader/resource_loader.h

diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h

index bb21509e363b789266ce0742603da68182236361..3e7bfc3b9a7036f3a100bca2faaef8f5c493132e 100644

--- a/content/browser/loader/resource_loader.h

+++ b/content/browser/loader/resource_loader.h

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

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

+#include "base/timer/timer.h"

#include "content/browser/loader/resource_handler.h"

#include "content/browser/ssl/ssl_client_auth_handler.h"

#include "content/browser/ssl/ssl_error_handler.h"

@@ -145,6 +146,8 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,

// which point we'll receive a new ResourceHandler.

bool is_transferring_;

+ base::RepeatingTimer<ResourceLoader> progress_timer_;

base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_;

DISALLOW_COPY_AND_ASSIGN(ResourceLoader);