Add "dangerous download" view on OS X, for now for dmg files. Also fix download item layout.

chrome/browser/download/download_manager.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_manager.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/timer.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_file.h"
+#include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #include "base/registry.h"
 #include "base/win_util.h"
 #endif
 
-#if !defined(OS_MACOSX)
-// Used for initializing the list of dangerous extensions. We don't support it
-// yet on mac.
-#include "chrome/browser/download/download_util.h"
-#endif
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
 // Periodically update our observers.
 class DownloadItemUpdateTask : public Task {
  public:
   explicit DownloadItemUpdateTask(DownloadItem* item) : item_(item) {}
   void Run() { if (item_) item_->UpdateObservers(); }
@@ skipping 457 matching lines @@
 
   // This variable is needed to resolve which CreateDirectory we want to point
   // to. Without it, the NewRunnableFunction cannot resolve the ambiguity.
   // TODO(estade): when file_util::CreateDirectory(wstring) is removed,
   // get rid of |CreateDirectoryPtr|.
   bool (*CreateDirectoryPtr)(const FilePath&) = &file_util::CreateDirectory;
   // Ensure that the download directory specified in the preferences exists.
   file_loop_->PostTask(FROM_HERE, NewRunnableFunction(
       CreateDirectoryPtr, download_path()));
 
-#if defined(OS_WIN) || defined(OS_LINUX)
   // We use this to determine possibly dangerous downloads.
   download_util::InitializeExeTypes(&exe_types_);
-#endif
 
   // We store any file extension that should be opened automatically at
   // download completion in this pref.
   std::wstring extensions_to_open =
       prefs->GetString(prefs::kDownloadExtensionsToOpen);
   std::vector<std::wstring> extensions;
   SplitString(extensions_to_open, L':', &extensions);
   for (size_t i = 0; i < extensions.size(); ++i) {
     if (!extensions[i].empty() && !IsExecutable(
         FilePath::FromWStringHack(extensions[i]).value()))
@@ skipping 783 matching lines @@
   }
   for (size_t i = 0; i < arraysize(kExecutableBlackList); ++i) {
     if (net::MatchesMimeType(kExecutableBlackList[i], mime_type))
       return false;
   }
   // We consider only other application types to be executable.
   return net::MatchesMimeType("application/*", mime_type);
 }
 
 bool DownloadManager::IsExecutable(const FilePath::StringType& extension) {
-#if defined(OS_MACOSX)
-  // We don't have dangerous download support on mac yet.
-  return false;
-#else
   if (!IsStringASCII(extension))
     return false;
 #if defined(OS_WIN)
   std::string ascii_extension = WideToASCII(extension);
-#elif defined(OS_LINUX)
+#elif defined(OS_POSIX)
   std::string ascii_extension = extension;
 #endif
   StringToLowerASCII(&ascii_extension);
 
   return exe_types_.find(ascii_extension) != exe_types_.end();
-#endif  // !defined(OS_MACOSX)
 }
 
 void DownloadManager::ResetAutoOpenFiles() {
   auto_open_.clear();
   SaveAutoOpens();
 }
 
 bool DownloadManager::HasAutoOpenFileTypesRegistered() const {
   return !auto_open_.empty();
 }
@@ skipping 172 matching lines @@
 
   if (contents)
     contents->OnStartDownload(download);
 }
 
 // Clears the last download path, used to initialize "save as" dialogs.
 void DownloadManager::ClearLastDownloadPath() {
   last_download_path_ = FilePath();
 }