Download filename determination refactor (3/3)

chrome/browser/download/download_file_picker.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_DOWNLOAD_FILE_PICKER_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_PICKER_H_
 #pragma once
 
+#include "base/callback.h"
 #include "chrome/browser/ui/select_file_dialog.h"
 
 class FilePath;
 
 namespace content {
 class DownloadItem;
 class DownloadManager;
 class WebContents;
 }
 
 // Handles showing a dialog to the user to ask for the filename for a download.
 class DownloadFilePicker : public SelectFileDialog::Listener {
  public:
+  // Callback invoked when the user chooses a download path. If the user cancels
+  // the operation, |selected_path| will be empty.
+  typedef base::Callback<void(const FilePath& selected_path)>
+      FileSelectedCallback;
+
   DownloadFilePicker();
   virtual ~DownloadFilePicker();
 
   void Init(content::DownloadManager* download_manager,
-            content::DownloadItem* item);
+            content::DownloadItem* item,
+            const FilePath& suggested_path,
+            const FileSelectedCallback& callback);
 
  protected:
   // On ChromeOS, DownloadItem::GetTargetPath is a temporary local filename.

[Randy Smith (Not in Mondays), 2012/07/12 17:01:22]

I don't see the relationship of this comment to the following routine--is it
stale?

[asanka, 2012/07/18 21:50:56]

It was stale. Fixed.

-  virtual void InitSuggestedPath(content::DownloadItem* item);
+  virtual void InitSuggestedPath(content::DownloadItem* item,
+                                 const FilePath& suggested_path);
   void set_suggested_path(const FilePath& suggested_path) {
     suggested_path_ = suggested_path;
   }
 
+  // Runs |file_selected_callback_| with |path| and then deletes this object.
+  void OnFileSelected(const FilePath& path);
+
   void RecordFileSelected(const FilePath& path);
 
   scoped_refptr<content::DownloadManager> download_manager_;
   int32 download_id_;
 
  private:
   // SelectFileDialog::Listener implementation.
   virtual void FileSelected(const FilePath& path,
                             int index,
                             void* params) OVERRIDE;
   virtual void FileSelectionCanceled(void* params) OVERRIDE;
 
   FilePath suggested_path_;
 
+  FileSelectedCallback file_selected_callback_;
+
   // For managing select file dialogs.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFilePicker);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_PICKER_H_