diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 18:19:27 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 18:19:27 +0000 |
| commit | 0bfbf88d75aae7adf722238e174dd11e07c9d133 (patch) | |
| tree | 5270a03f23333f06db0599d3105d3bf81e9e879c /content/browser/download | |
| parent | bd078730e1d095f1948a2d2b86856cfdfa002dc0 (diff) | |
| download | chromium_src-0bfbf88d75aae7adf722238e174dd11e07c9d133.zip chromium_src-0bfbf88d75aae7adf722238e174dd11e07c9d133.tar.gz chromium_src-0bfbf88d75aae7adf722238e174dd11e07c9d133.tar.bz2 | |
Move the remaining TabContents methods to the WebContents interface, switching unix_hacker to CamelCase as necessary. I've moved the WebContents definitions to be in the same order as the declarations.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8958003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/download')
| -rw-r--r-- | content/browser/download/download_manager_impl.cc | 5 | ||||
| -rw-r--r-- | content/browser/download/save_package.cc | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index d858e10..c73046b 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -34,6 +34,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/web_contents_delegate.h" using content::BrowserThread; using content::DownloadItem; @@ -989,8 +990,8 @@ void DownloadManagerImpl::ShowDownloadInBrowser(DownloadItem* download) { if (!content) content = delegate_->GetAlternativeTabContentsToNotifyForDownload(); - if (content) - content->OnStartDownload(download); + if (content && content->GetDelegate()) + content->GetDelegate()->OnStartDownload(content, download); } int DownloadManagerImpl::InProgressCount() const { diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index bcd075b..b1f3516 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -1157,7 +1157,7 @@ void SavePackage::GetSaveInfo() { DCHECK(download_manager_); download_manager_->delegate()->GetSaveDir( tab_contents(), &website_save_dir, &download_save_dir); - std::string mime_type = tab_contents()->contents_mime_type(); + std::string mime_type = tab_contents()->GetContentsMimeType(); std::string accept_languages = content::GetContentClient()->browser()->GetAcceptLangs( tab_contents()->GetBrowserContext()); @@ -1230,7 +1230,7 @@ void SavePackage::OnPathPicked(const FilePath& final_name, saved_main_file_path_ = final_name; // TODO(asanka): This call may block on IO and shouldn't be made // from the UI thread. See http://crbug.com/61827. - net::GenerateSafeFileName(tab_contents()->contents_mime_type(), false, + net::GenerateSafeFileName(tab_contents()->GetContentsMimeType(), false, &saved_main_file_path_); saved_main_directory_path_ = saved_main_file_path_.DirName(); |