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

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

 // Copyright 2013 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_DOWNLOAD_TARGET_DETERMINER_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TARGET_DETERMINER_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/common/cancelable_request.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 "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager_delegate.h"
 
 class ChromeDownloadManagerDelegate;
 class Profile;
 class DownloadPrefs;
 
 namespace content {
 enum DownloadDangerType;
@@ skipping 18 matching lines @@
 // determining the download target. It observes the DownloadItem and aborts the
 // process if the download is removed. DownloadTargetDeterminerDelegate is
 // responsible for providing external dependencies and prompting the user if
 // necessary.
 //
 // The only public entrypoint is the static Start() method which creates an
 // instance of DownloadTargetDeterminer.
 class DownloadTargetDeterminer
     : public content::DownloadItem::Observer {
  public:
-  typedef base::Callback<void(scoped_ptr<DownloadTargetInfo>)>
-      CompletionCallback;
-
   // Start the process of determing the target of |download|.
   //
   // |initial_virtual_path| if non-empty, defines the initial virtual path for
   //   the target determination process. If one isn't specified, one will be
   //   generated based on the response data specified in |download| and the
   //   users' downloads directory.
   //   Note: |initial_virtual_path| is only used if download has prompted the
   //       user before and doesn't have a forced path.
   // |download_prefs| is required and must outlive |download|. It is used for
   //   determining the user's preferences regarding the default downloads
   //   directory, prompting and auto-open behavior.
   // |delegate| is required and must live until |callback| is invoked.
   // |callback| will be scheduled asynchronously on the UI thread after download
   //   determination is complete or after |download| is destroyed.
   //
   // Start() should be called on the UI thread.
   static void Start(content::DownloadItem* download,
                     const base::FilePath& initial_virtual_path,
                     DownloadPrefs* download_prefs,
                     DownloadTargetDeterminerDelegate* delegate,
-                    const CompletionCallback& callback);
+                    const content::DownloadTargetCallback& callback);
 
   // Returns a .crdownload intermediate path for the |suggested_path|.
   static base::FilePath GetCrDownloadPath(const base::FilePath& suggested_path);
 
  private:
   // The main workflow is controlled via a set of state transitions. Each state
   // has an associated handler. The handler for STATE_FOO is DoFoo. Each handler
   // performs work, determines the next state to transition to and returns a
   // Result indicating how the workflow should proceed. The loop ends when a
   // handler returns COMPLETE.
   enum State {
     STATE_GENERATE_TARGET_PATH,
     STATE_NOTIFY_EXTENSIONS,
     STATE_RESERVE_VIRTUAL_PATH,
     STATE_PROMPT_USER_FOR_DOWNLOAD_PATH,
     STATE_DETERMINE_LOCAL_PATH,
-    STATE_DETERMINE_MIME_TYPE,
-    STATE_DETERMINE_IF_HANDLED_BY_BROWSER,
     STATE_CHECK_DOWNLOAD_URL,
     STATE_CHECK_VISITED_REFERRER_BEFORE,
     STATE_DETERMINE_INTERMEDIATE_PATH,
     STATE_NONE,
   };
 
   // Result code returned by each step of the workflow below. Controls execution
   // of DoLoop().
   enum Result {
     // Continue processing. next_state_ is required to not be STATE_NONE.
@@ skipping 12 matching lines @@
 
   // Used with IsDangerousFile to indicate whether the user has visited the
   // referrer URL for the download prior to today.
   enum PriorVisitsToReferrer {
     NO_VISITS_TO_REFERRER,
     VISITED_REFERRER,
   };
 
   // Construct a DownloadTargetDeterminer object. Constraints on the arguments
   // are as per Start() above.
-  DownloadTargetDeterminer(content::DownloadItem* download,
-                           const base::FilePath& initial_virtual_path,
-                           DownloadPrefs* download_prefs,
-                           DownloadTargetDeterminerDelegate* delegate,
-                           const CompletionCallback& callback);
+  DownloadTargetDeterminer(
+      content::DownloadItem* download,
+      const base::FilePath& initial_virtual_path,
+      DownloadPrefs* download_prefs,
+      DownloadTargetDeterminerDelegate* delegate,
+      const content::DownloadTargetCallback& callback);
 
   virtual ~DownloadTargetDeterminer();
 
   // Invoke each successive handler until a handler returns QUIT_DOLOOP or
   // COMPLETE. Note that as a result, this object might be deleted. So |this|
   // should not be accessed after calling DoLoop().
   void DoLoop();
 
   // === Main workflow ===
 
@@ skipping 33 matching lines @@
 
   // Callback invoked after the file picker completes. Cancels the download if
   // the user cancels the file picker.
   void PromptUserForDownloadPathDone(const base::FilePath& virtual_path);
 
   // Up until this point, the path that was used is considered to be a virtual
   // path. This step determines the local file system path corresponding to this
   // virtual path. The translation is done by invoking the DetermineLocalPath()
   // method on the delegate.
   // Next state:
-  // - STATE_DETERMINE_MIME_TYPE.
+  // - STATE_CHECK_DOWNLOAD_URL.
   Result DoDetermineLocalPath();
 
   // Callback invoked when the delegate has determined local path.
   void DetermineLocalPathDone(const base::FilePath& local_path);
 
-  // Determine the MIME type corresponding to the local file path. This is only
-  // done if the local path and the virtual path was the same. I.e. The file is
-  // intended for the local file system. This restriction is there because the
-  // resulting MIME type is only valid for determining whether the browser can
-  // handle the download if it were opened via a file:// URL.
-  // Next state:
-  // - STATE_DETERMINE_IF_HANDLED_BY_BROWSER.
-  Result DoDetermineMimeType();
-
-  // Callback invoked when the MIME type is available. Since determination of
-  // the MIME type can involve disk access, it is done in the blocking pool.
-  void DetermineMimeTypeDone(const std::string& mime_type);
-
-  // Determine if the file type can be handled by the browser if it were to be
-  // opened via a file:// URL.
-  // Next state:
-  // - STATE_CHECK_DOWNLOAD_URL.
-  Result DoDetermineIfHandledByBrowser();
-
-  // Callback invoked when a decision is available about whether the file type
-  // can be handled by the browser. The actual decision depends on the profile
-  // and has to be made on the UI thread. Therefore this method receives a
-  // callback that can determine whether the download is handled by the browser
-  // based on a passed-in Profile* parameter.
-  void DetermineIfHandledByBrowserDone(
-      const base::Callback<bool(Profile*)>& per_profile_handler_checker);
-
   // Checks whether the downloaded URL is malicious. Invokes the
   // DownloadProtectionService via the delegate.
   // Next state:
   // - STATE_CHECK_VISITED_REFERRER_BEFORE.
   Result DoCheckDownloadUrl();
 
   // Callback invoked after the delegate has checked the download URL. Sets the
   // danger type of the download to |danger_type|.
   void CheckDownloadUrlDone(content::DownloadDangerType danger_type);
 
@@ skipping 53 matching lines @@
   // state
   State next_state_;
   bool should_prompt_;
   bool should_notify_extensions_;
   bool create_target_directory_;
   DownloadPathReservationTracker::FilenameConflictAction conflict_action_;
   content::DownloadDangerType danger_type_;
   base::FilePath virtual_path_;
   base::FilePath local_path_;
   base::FilePath intermediate_path_;
-  std::string mime_type_;
-  bool is_filetype_handled_securely_;
 
   content::DownloadItem* download_;
   const bool is_resumption_;
   DownloadPrefs* download_prefs_;
   DownloadTargetDeterminerDelegate* delegate_;
-  CompletionCallback completion_callback_;
+  content::DownloadTargetCallback completion_callback_;
   CancelableRequestConsumer history_consumer_;
 
   base::WeakPtrFactory<DownloadTargetDeterminer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTargetDeterminer);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TARGET_DETERMINER_H_