content/browser/download/download_create_info.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/download/download_create_info.cc

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

Patch Set: merge 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/download/download_create_info.h ('k') | content/browser/download/download_file.h » ('j') | content/browser/download/download_id_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/download/download_create_info.cc

diff --git a/content/browser/download/download_create_info.cc b/content/browser/download/download_create_info.cc

index 72bb3237f5131709d0a4d6f2e4e076655cd479d4..afd95a742910778b001708de40d202ae99c3fc96 100644

--- a/content/browser/download/download_create_info.cc

+++ b/content/browser/download/download_create_info.cc

@@ -15,7 +15,7 @@ DownloadCreateInfo::DownloadCreateInfo(const FilePath& path,

int64 received_bytes,

int64 total_bytes,

int32 state,

- int32 download_id,

+ const DownloadId& download_id,

bool has_user_gesture,

content::PageTransition transition_type)

: path(path),

@@ -37,7 +37,7 @@ DownloadCreateInfo::DownloadCreateInfo()

received_bytes(0),

total_bytes(0),

state(-1),

- download_id(-1),

+ download_id(DownloadId::Invalid()),

has_user_gesture(false),

transition_type(content::PAGE_TRANSITION_LINK),

db_handle(0),

@@ -49,14 +49,14 @@ DownloadCreateInfo::~DownloadCreateInfo() {

std::string DownloadCreateInfo::DebugString() const {

return base::StringPrintf("{"

- " download_id = %d"

+ " download_id = %s"

" url = \"%s\""

" path = \"%" PRFilePath "\""

" received_bytes = %" PRId64

" total_bytes = %" PRId64

" prompt_user_for_save_location = %c"

" }",

- download_id,

+ download_id.DebugString().c_str(),

url().spec().c_str(),

path.value().c_str(),

received_bytes,