diff options
author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 18:49:58 +0000 |
---|---|---|
committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 18:49:58 +0000 |
commit | 6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1 (patch) | |
tree | 8e833c393312e866250077c15bc1d90464fe99d7 /chrome/browser/download/save_package.cc | |
parent | 963dfb5a05c5b0e3fa8ed74d803f01cb10fd455e (diff) | |
download | chromium_src-6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1.zip chromium_src-6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1.tar.gz chromium_src-6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1.tar.bz2 |
Support dragging a virtual file out of the browser.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/351029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/save_package.cc')
-rw-r--r-- | chrome/browser/download/save_package.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index 03a4cb4..446022d 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -304,7 +304,7 @@ bool SavePackage::Init() { // Create the fake DownloadItem and display the view. download_ = new DownloadItem(1, saved_main_file_path_, 0, page_url_, GURL(), - "", FilePath(), Time::Now(), 0, -1, -1, false, false, false); + "", FilePath(), Time::Now(), 0, -1, -1, false, false, false, false); download_->set_manager(tab_contents_->profile()->GetDownloadManager()); tab_contents_->OnStartDownload(download_); @@ -335,7 +335,7 @@ bool SavePackage::Init() { } // Generate name for saving resource. -bool SavePackage::GenerateFilename(const std::string& disposition, +bool SavePackage::GenerateFileName(const std::string& disposition, const GURL& url, bool need_html_ext, FilePath::StringType* generated_name) { @@ -448,7 +448,7 @@ void SavePackage::StartSave(const SaveFileCreateInfo* info) { // instead of opening it as HTML. bool need_html_ext = info->save_source == SaveFileCreateInfo::SAVE_FILE_FROM_DOM; - if (!GenerateFilename(info->content_disposition, + if (!GenerateFileName(info->content_disposition, GURL(info->url), need_html_ext, &generated_name)) { @@ -470,7 +470,7 @@ void SavePackage::StartSave(const SaveFileCreateInfo* info) { DCHECK(save_type_ == SAVE_AS_COMPLETE_HTML); DCHECK(!saved_main_directory_path_.empty()); - // Now we get final name retrieved from GenerateFilename, we will use it + // Now we get final name retrieved from GenerateFileName, we will use it // rename the SaveItem. FilePath final_name = saved_main_directory_path_.Append(generated_name); save_item->Rename(final_name); @@ -1172,7 +1172,7 @@ void SavePackage::ContinueSave(SavePackageParam* param, param->saved_main_file_path = final_name; DownloadManager* dlm = tab_contents_->profile()->GetDownloadManager(); DCHECK(dlm); - dlm->GenerateSafeFilename(param->current_tab_mime_type, + dlm->GenerateSafeFileName(param->current_tab_mime_type, ¶m->saved_main_file_path); // The option index is not zero-based. |