summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 20:08:00 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 20:08:00 +0000
commit7bea1c588a1951e65f525cdab0e99c0839be691c (patch)
tree872e6a34522220a976c15b45759e665137deb5d1 /chrome/browser/download
parent106c901495fac4d0a09656144e37c6c5abe7a6e0 (diff)
downloadchromium_src-7bea1c588a1951e65f525cdab0e99c0839be691c.zip
chromium_src-7bea1c588a1951e65f525cdab0e99c0839be691c.tar.gz
chromium_src-7bea1c588a1951e65f525cdab0e99c0839be691c.tar.bz2
Add a Cocoa file picker.
Review URL: http://codereview.chromium.org/73044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13695 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/download_manager.h8
-rw-r--r--chrome/browser/download/save_package.cc5
-rw-r--r--chrome/browser/download/save_package.h8
4 files changed, 3 insertions, 23 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index e6a1b0c..92d20db 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -628,7 +628,6 @@ void DownloadManager::CheckIfSuggestedPathExists(DownloadCreateInfo* info) {
}
void DownloadManager::OnPathExistenceAvailable(DownloadCreateInfo* info) {
-#if defined(OS_WIN) || defined(OS_LINUX)
DCHECK(MessageLoop::current() == ui_loop_);
DCHECK(info);
@@ -654,10 +653,6 @@ void DownloadManager::OnPathExistenceAvailable(DownloadCreateInfo* info) {
// No prompting for download, just continue with the suggested name.
ContinueStartDownload(info, info->suggested_path);
}
-#elif defined(OS_MACOSX)
- // TODO(port): port this file -- need dialogs.
- NOTIMPLEMENTED();
-#endif
}
void DownloadManager::ContinueStartDownload(DownloadCreateInfo* info,
diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index 8e7c9d4..5cb22a4 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -51,14 +51,8 @@
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/history/download_types.h"
#include "chrome/browser/history/history.h"
-#include "chrome/common/pref_member.h"
-
-#if defined(OS_WIN) || defined(OS_LINUX)
-// TODO(port): port this header.
#include "chrome/browser/shell_dialogs.h"
-#elif defined(OS_MACOSX)
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
+#include "chrome/common/pref_member.h"
class DownloadFileManager;
class DownloadItemView;
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 01a1b26..0c40a82 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -1025,7 +1025,6 @@ void SavePackage::GetSaveInfo() {
file_type_index = 1;
}
-#if defined(OS_LINUX) || defined(OS_WIN)
if (g_should_prompt_for_filename) {
if (!select_file_dialog_.get())
select_file_dialog_ = SelectFileDialog::Create(this);
@@ -1038,9 +1037,7 @@ void SavePackage::GetSaveInfo() {
platform_util::GetTopLevel(
web_contents_->GetNativeView()),
save_params);
- } else
-#endif // defined(OS_LINUX) || defined(OS_WIN)
- {
+ } else {
// Just use 'suggested_path' instead of opening the dialog prompt.
ContinueSave(save_params, suggested_path, file_type_index);
delete save_params;
diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h
index 5a42fe3..8feabd3 100644
--- a/chrome/browser/download/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -19,6 +19,7 @@
#include "chrome/browser/download/save_item.h"
#include "chrome/browser/download/save_types.h"
#include "chrome/browser/renderer_host/render_view_host_delegate.h"
+#include "chrome/browser/shell_dialogs.h"
class SaveFileManager;
class SavePackage;
@@ -32,13 +33,6 @@ class WebContents;
class URLRequestContext;
class WebContents;
-#if defined(OS_WIN) || defined(OS_LINUX)
-// TODO(port): port this header.
-#include "chrome/browser/shell_dialogs.h"
-#elif defined(OS_MACOSX)
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
namespace base {
class Thread;
class Time;