Revert 233460 "Prefer opening PDF downloads in the browser."

trunk/src/chrome/browser/download/chrome_download_manager_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 #define CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/download/download_path_reservation_tracker.h"
 #include "chrome/browser/download/download_target_determiner_delegate.h"
-#include "chrome/browser/download/download_target_info.h"
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class DownloadPrefs;
 class Profile;
 
@@ skipping 64 matching lines @@
       const base::FilePath::StringType& default_extension,
       bool can_save_as_complete,
       const content::SavePackagePathPickedCallback& callback) OVERRIDE;
   virtual void OpenDownload(content::DownloadItem* download) OVERRIDE;
   virtual void ShowDownloadInShell(content::DownloadItem* download) OVERRIDE;
   virtual void CheckForFileExistence(
       content::DownloadItem* download,
       const content::CheckForFileExistenceCallback& callback) OVERRIDE;
   virtual std::string ApplicationClientIdForFileScanning() const OVERRIDE;
 
-  // Opens a download using the platform handler. DownloadItem::OpenDownload,
-  // which ends up being handled by OpenDownload(), will open a download in the
-  // browser if doing so is preferred.
-  void OpenDownloadUsingPlatformHandler(content::DownloadItem* download);
-
   DownloadPrefs* download_prefs() { return download_prefs_.get(); }
 
  protected:
   // So that test classes can inherit from this for override purposes.
   virtual ~ChromeDownloadManagerDelegate();
 
   // So that test classes that inherit from this for override purposes
   // can call back into the DownloadManager.
   content::DownloadManager* download_manager_;
 
@@ skipping 16 matching lines @@
       const base::FilePath& suggested_virtual_path,
       const FileSelectedCallback& callback) OVERRIDE;
   virtual void DetermineLocalPath(
       content::DownloadItem* download,
       const base::FilePath& virtual_path,
       const LocalPathCallback& callback) OVERRIDE;
   virtual void CheckDownloadUrl(
       content::DownloadItem* download,
       const base::FilePath& suggested_virtual_path,
       const CheckDownloadUrlCallback& callback) OVERRIDE;
-  virtual void GetFileMimeType(
-      const base::FilePath& path,
-      const GetFileMimeTypeCallback& callback) OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<ChromeDownloadManagerDelegate>;
 
   typedef std::vector<content::DownloadIdCallback> IdCallbackVector;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Callback function after the DownloadProtectionService completes.
   void CheckClientDownloadDone(
       uint32 download_id,
       safe_browsing::DownloadProtectionService::DownloadCheckResult result);
 
   // Internal gateways for ShouldCompleteDownload().
   bool IsDownloadReadyForCompletion(
       content::DownloadItem* item,
       const base::Closure& internal_complete_callback);
   void ShouldCompleteDownloadInternal(
     uint32 download_id,
     const base::Closure& user_complete_callback);
 
   void ReturnNextId(const content::DownloadIdCallback& callback);
 
-  void OnDownloadTargetDetermined(
-      int32 download_id,
-      const content::DownloadTargetCallback& callback,
-      scoped_ptr<DownloadTargetInfo> target_info);
-
   Profile* profile_;
   uint32 next_download_id_;
   IdCallbackVector id_callbacks_;
   scoped_ptr<DownloadPrefs> download_prefs_;
 
   // Maps from pending extension installations to DownloadItem IDs.
   typedef base::hash_map<extensions::CrxInstaller*,
       content::DownloadOpenDelayedCallback> CrxInstallerMap;
   CrxInstallerMap crx_installers_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeDownloadManagerDelegate);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_