content/browser/renderer_host/resource_dispatcher_host.cc - Issue 8401001: Fix history importing by delaying DownloadManager creation.

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/renderer_host/resource_dispatcher_host.cc

Issue 8401001: Fix history importing by delaying DownloadManager creation. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: fix ifndefs Created 9 years, 2 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: content/browser/renderer_host/resource_dispatcher_host.cc

diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc

index 4a6a0577603bcc8e7fc368433a0248a0c232656f..472c3fbb5bcad61a05af3942ead149974374cb9c 100644

--- a/content/browser/renderer_host/resource_dispatcher_host.cc

+++ b/content/browser/renderer_host/resource_dispatcher_host.cc

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

#include "content/browser/chrome_blob_storage_context.h"

#include "content/browser/cross_site_request_manager.h"

#include "content/browser/download/download_file_manager.h"

+#include "content/browser/download/download_id_factory.h"

#include "content/browser/download/download_manager.h"

#include "content/browser/download/download_resource_handler.h"

#include "content/browser/download/save_file_manager.h"

@@ -50,10 +51,10 @@

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

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

#include "content/browser/worker_host/worker_service.h"

-#include "content/public/browser/notification_service.h"

#include "content/common/resource_messages.h"

#include "content/common/view_messages.h"

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

+#include "content/public/browser/notification_service.h"

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

#include "content/public/common/content_switches.h"

#include "content/public/common/url_constants.h"

@@ -830,7 +831,7 @@ void ResourceDispatcherHost::BeginDownload(

request_id_--;

- DownloadId dl_id = context.next_download_id_thunk().Run();

+ DownloadId dl_id = context.download_id_factory()->GetNextId();

scoped_refptr<ResourceHandler> handler(

new DownloadResourceHandler(this,