summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-12 19:58:24 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-12 19:58:24 +0000
commit572ce75ae6ca06377c789c4a88663590689122b1 (patch)
tree4f97e917b79e6000b905deb0dbe69ebd08b24c58 /chrome
parent6f5ceb6d1bdf5293cec2de6d844e2ca3ca92999e (diff)
downloadchromium_src-572ce75ae6ca06377c789c4a88663590689122b1.zip
chromium_src-572ce75ae6ca06377c789c4a88663590689122b1.tar.gz
chromium_src-572ce75ae6ca06377c789c4a88663590689122b1.tar.bz2
Revert thakis's changes to download_file.cc from r17595.
BUG=13991 Review URL: http://codereview.chromium.org/126066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/download/download_file.cc23
1 files changed, 8 insertions, 15 deletions
diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc
index 8731b53..5dca83e 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -536,23 +536,16 @@ void DownloadFileManager::OnShowDownloadInShell(const FilePath& full_path) {
void DownloadFileManager::OnOpenDownloadInShell(const FilePath& full_path,
const GURL& url,
gfx::NativeView parent_window) {
+ DCHECK(MessageLoop::current() == file_loop_);
#if defined(OS_WIN)
- DCHECK(MessageLoop::current() == file_loop_);
- if (NULL != parent_window) {
- win_util::SaferOpenItemViaShell(parent_window, L"", full_path,
- UTF8ToWide(url.spec()));
- } else {
- win_util::OpenItemViaShell(full_path);
- }
-#elif defined(OS_MACOSX)
- // Quarantine takes care of asking the user about dangerous files, so we can
- // just open it.
- platform_util::OpenItem(full_path);
-#else
- // TODO(port) implement me. (Does Linux need to use a "safe" open, or can it
- // just share the Mac call to platform_util?)
- NOTIMPLEMENTED();
+ if (NULL != parent_window) {
+ win_util::SaferOpenItemViaShell(parent_window, L"", full_path,
+ UTF8ToWide(url.spec()));
+ return;
+ }
#endif
+
+ platform_util::OpenItem(full_path);
}
// The DownloadManager in the UI thread has provided a final name for the