diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /content/browser/download/download_file_factory.cc | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
| download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz | |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'content/browser/download/download_file_factory.cc')
| -rw-r--r-- | content/browser/download/download_file_factory.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/download/download_file_factory.cc b/content/browser/download/download_file_factory.cc index 4e164b3efe..a7fe7b834a 100644 --- a/content/browser/download/download_file_factory.cc +++ b/content/browser/download/download_file_factory.cc @@ -5,7 +5,7 @@ #include "content/browser/download/download_file_factory.h" #include "content/browser/download/download_file_impl.h" -#include "content/browser/power_save_blocker.h" +#include "content/public/browser/power_save_blocker.h" namespace content { @@ -13,7 +13,7 @@ DownloadFileFactory::~DownloadFileFactory() {} DownloadFile* DownloadFileFactory::CreateFile( scoped_ptr<DownloadSaveInfo> save_info, - const FilePath& default_downloads_directory, + const base::FilePath& default_downloads_directory, const GURL& url, const GURL& referrer_url, bool calculate_hash, @@ -21,7 +21,7 @@ DownloadFile* DownloadFileFactory::CreateFile( const net::BoundNetLog& bound_net_log, base::WeakPtr<DownloadDestinationObserver> observer) { scoped_ptr<PowerSaveBlocker> psb( - new PowerSaveBlocker( + PowerSaveBlocker::Create( PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension, "Download in progress")); return new DownloadFileImpl( |