summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 21:57:57 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 21:57:57 +0000
commitc0d33cd059a742b2daf283965392700328b80a81 (patch)
treee28615904b0e6496c55802016f8c7c2e27d9ff52 /chrome/browser/download
parentfad9ef5cb3f55eba164ff4e63db803c5a7fa17a5 (diff)
downloadchromium_src-c0d33cd059a742b2daf283965392700328b80a81.zip
chromium_src-c0d33cd059a742b2daf283965392700328b80a81.tar.gz
chromium_src-c0d33cd059a742b2daf283965392700328b80a81.tar.bz2
Initial download shelf on OS X.
This has lots of missing stuff (e.g. a custom download item view that shows download progress, the popup is the same for in-progress and completed downloads, no animation, everything looks ugly, the info bubble overlaps the shelf when it's visible, no "open download manager page" link, etc), but the basic functionality is hooked up: The shelf appears when files are downloaded, and something ugly is added to the shelf for each download. The popup's "Reveral in Finder" even works. The shelf is per-window as it should be. BUG=12500 TEST=Download something and check the shelf appears. Click the close button and make sure it disappears again. Review URL: http://codereview.chromium.org/93129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_manager.cc5
-rw-r--r--chrome/browser/download/save_package.cc5
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index de48b90..7ed4ad0 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -636,6 +636,7 @@ void DownloadManager::OnPathExistenceAvailable(DownloadCreateInfo* info) {
DCHECK(info);
if (info->save_as) {
+#if defined(OS_WIN) || defined(OS_LINUX)
// We must ask the user for the place to put the download.
if (!select_file_dialog_.get())
select_file_dialog_ = SelectFileDialog::Create(this);
@@ -655,6 +656,10 @@ void DownloadManager::OnPathExistenceAvailable(DownloadCreateInfo* info) {
info->suggested_path,
&file_type_info, 0, FILE_PATH_LITERAL(""),
owning_window, info);
+#elif defined(OS_MACOSX)
+ // TODO(port): port this file -- need dialogs.
+ NOTIMPLEMENTED();
+#endif
} else {
// No prompting for download, just continue with the suggested name.
ContinueStartDownload(info, info->suggested_path);
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 7e90cbb..beca753 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -252,12 +252,7 @@ bool SavePackage::Init() {
download_ = new DownloadItem(1, saved_main_file_path_, 0, page_url_,
FilePath(), Time::Now(), 0, -1, -1, false);
download_->set_manager(tab_contents_->profile()->GetDownloadManager());
-#if !defined(OS_MACOSX)
tab_contents_->OnStartDownload(download_);
-#else
- // TODO(port): Create a download shelf for mac.
- NOTIMPLEMENTED();
-#endif
// Check save type and process the save page job.
if (save_type_ == SAVE_AS_COMPLETE_HTML) {