Download filename determination refactor (3/3)

chrome/browser/download/download_file_picker.cc

 // 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.
 
 #include "chrome/browser/download/download_file_picker.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
@@ skipping 40 matching lines @@
   if (suggested_path.DirName() != actual_path.DirName())
     return FILE_PICKER_DIFFERENT_DIR;
   return FILE_PICKER_DIFFERENT_NAME;
 }
 
 }  // namespace
 
 DownloadFilePicker::DownloadFilePicker() : download_id_(0) {
 }
 
-void DownloadFilePicker::Init(DownloadManager* download_manager,
-                              DownloadItem* item) {
+void DownloadFilePicker::Init(
+    DownloadManager* download_manager,
+    DownloadItem* item,
+    const FilePath& suggested_path,
+    const ChromeDownloadManagerDelegate::FileSelectedCallback& callback) {
   download_manager_ = download_manager;
   download_id_ = item->GetId();
-  InitSuggestedPath(item);
+  file_selected_callback_ = callback;
+  InitSuggestedPath(item, suggested_path);
 
   DCHECK(download_manager_);
   WebContents* web_contents = item->GetWebContents();
   select_file_dialog_ = SelectFileDialog::Create(
       this, new ChromeSelectFilePolicy(web_contents));
   SelectFileDialog::FileTypeInfo file_type_info;
   FilePath::StringType extension = suggested_path_.Extension();
   if (!extension.empty()) {
     extension.erase(extension.begin());  // drop the .
     file_type_info.extensions.resize(1);
@@ skipping 10 matching lines @@
       &file_type_info,
       0,
       FILE_PATH_LITERAL(""),
       owning_window,
       NULL);
 }
 
 DownloadFilePicker::~DownloadFilePicker() {
 }
 
-void DownloadFilePicker::InitSuggestedPath(DownloadItem* item) {
-  set_suggested_path(item->GetTargetFilePath());
+void DownloadFilePicker::InitSuggestedPath(DownloadItem* item,
+                                           const FilePath& suggested_path) {
+  set_suggested_path(suggested_path);
+}
+
+void DownloadFilePicker::OnFileSelected(const FilePath& path) {
+  file_selected_callback_.Run(path);
+  delete this;
 }
 
 void DownloadFilePicker::RecordFileSelected(const FilePath& path) {
   FilePickerResult result = ComparePaths(suggested_path_, path);
   RecordFilePickerResult(download_manager_, result);
 }
 
 void DownloadFilePicker::FileSelected(const FilePath& path,
                                       int index,
                                       void* params) {
   RecordFileSelected(path);
-
-  if (download_manager_)
-    download_manager_->FileSelected(path, download_id_);
-  delete this;
+  OnFileSelected(path);
+  // Deletes |this|
 }
 
 void DownloadFilePicker::FileSelectionCanceled(void* params) {
   RecordFilePickerResult(download_manager_, FILE_PICKER_CANCEL);
-  if (download_manager_)
-    download_manager_->FileSelectionCanceled(download_id_);
-  delete this;
+  OnFileSelected(FilePath());
+  // Deletes |this|
 }