diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
| commit | a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 (patch) | |
| tree | dafc1c6417406a7fbd422ad0bb890e96909ef564 /content/browser/download/download_manager_impl.cc | |
| parent | d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f (diff) | |
| download | chromium_org-a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7.tar.gz | |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
Diffstat (limited to 'content/browser/download/download_manager_impl.cc')
| -rw-r--r-- | content/browser/download/download_manager_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index ea0f305a5a..35825d32a9 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -413,7 +413,7 @@ void DownloadManagerImpl::StartDownloadWithId( file_factory_->CreateFile( info->save_info.Pass(), default_download_directory, info->url(), info->referrer_url, - delegate_->GenerateFileHash(), + delegate_ && delegate_->GenerateFileHash(), stream.Pass(), download->GetBoundNetLog(), download->DestinationObserverAsWeakPtr())); |