Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2689)

Unified Diff: chrome/browser/download/chrome_download_manager_delegate.cc

Issue 10815024: Revert 147594 - NaCl: Remove two uses of '#include "nacl/nacl_log.h"' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 | « chrome/browser/debugger/devtools_file_helper.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/chrome_download_manager_delegate.cc
===================================================================
--- chrome/browser/download/chrome_download_manager_delegate.cc (revision 147600)
+++ chrome/browser/download/chrome_download_manager_delegate.cc (working copy)
@@ -106,7 +106,7 @@
ChromeDownloadManagerDelegate::ChromeDownloadManagerDelegate(Profile* profile)
: profile_(profile),
next_download_id_(0),
- download_prefs_(new DownloadPrefs(profile->GetPrefs())) {
+ download_prefs_(new DownloadPrefs(profile)) {
}
ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
@@ -660,7 +660,7 @@
if (should_prompt && !download_manager_->LastDownloadPath().empty())
target_directory = download_manager_->LastDownloadPath();
else
- target_directory = download_prefs_->download_path();
+ target_directory = download_prefs_->DownloadPath();
suggested_path = target_directory.Append(generated_name);
} else {
DCHECK(!should_prompt);
@@ -704,7 +704,7 @@
this, download->GetId(), should_prompt, is_forced_path, danger_type));
#else
GetReservedPath(
- *download, suggested_path, download_prefs_->download_path(),
+ *download, suggested_path, download_prefs_->DownloadPath(),
!is_forced_path,
base::Bind(&ChromeDownloadManagerDelegate::OnPathReservationAvailable,
this, download->GetId(), should_prompt, danger_type));
@@ -725,7 +725,7 @@
return;
GetReservedPath(
- *download, suggested_path, download_prefs_->download_path(),
+ *download, suggested_path, download_prefs_->DownloadPath(),
!is_forced_path,
base::Bind(&ChromeDownloadManagerDelegate::OnPathReservationAvailable,
this, download->GetId(), should_prompt, danger_type));
« no previous file with comments | « chrome/browser/debugger/devtools_file_helper.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698