Move download filename determintion into a separate class.

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"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::DownloadItem;
 using content::DownloadManager;
 using content::WebContents;
@@ skipping 19 matching lines @@
     return;
   if (prefs->PromptForDownload())
     return;
   UMA_HISTOGRAM_ENUMERATION("Download.FilePickerResult",
                             result,
                             FILE_PICKER_MAX);
 }
 
 FilePickerResult ComparePaths(const base::FilePath& suggested_path,
                               const base::FilePath& actual_path) {
+  if (actual_path.empty())
+    return FILE_PICKER_CANCEL;
   if (suggested_path == actual_path)
     return FILE_PICKER_SAME;
   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,
+DownloadFilePicker::DownloadFilePicker(
     DownloadItem* item,
     const base::FilePath& suggested_path,
-    const ChromeDownloadManagerDelegate::FileSelectedCallback& callback) {
-  download_manager_ = download_manager;
-  download_id_ = item->GetId();
-  file_selected_callback_ = callback;
-  InitSuggestedPath(item, suggested_path);
-
+    const FileSelectedCallback& callback)
+    : suggested_path_(suggested_path),
+      file_selected_callback_(callback),
+      download_id_(item->GetId()) {

[benjhayden, 2013/04/26 15:07:37]

Is this used anywhere?

[asanka, 2013/04/26 17:02:21]

Apparently not. Removed.

+  download_manager_ =
+      content::BrowserContext::GetDownloadManager(item->GetBrowserContext());
   DCHECK(download_manager_);
   WebContents* web_contents = item->GetWebContents();
   select_file_dialog_ = ui::SelectFileDialog::Create(
       this, new ChromeSelectFilePolicy(web_contents));
   ui::SelectFileDialog::FileTypeInfo file_type_info;
   base::FilePath::StringType extension = suggested_path_.Extension();
   if (!extension.empty()) {
     extension.erase(extension.begin());  // drop the .
     file_type_info.extensions.resize(1);
     file_type_info.extensions[0].push_back(extension);
@@ skipping 10 matching lines @@
                                   &file_type_info,
                                   0,
                                   base::FilePath::StringType(),
                                   owning_window,
                                   NULL);
 }
 
 DownloadFilePicker::~DownloadFilePicker() {
 }
 
-void DownloadFilePicker::InitSuggestedPath(
-    DownloadItem* item,
-    const base::FilePath& suggested_path) {
-  set_suggested_path(suggested_path);
-}
-
 void DownloadFilePicker::OnFileSelected(const base::FilePath& path) {
+  FilePickerResult result = ComparePaths(suggested_path_, path);
+  RecordFilePickerResult(download_manager_, result);
   file_selected_callback_.Run(path);
   delete this;
 }
 
-void DownloadFilePicker::RecordFileSelected(const base::FilePath& path) {
-  FilePickerResult result = ComparePaths(suggested_path_, path);
-  RecordFilePickerResult(download_manager_, result);
-}
-
 void DownloadFilePicker::FileSelected(const base::FilePath& path,
                                       int index,
                                       void* params) {
-  RecordFileSelected(path);
   OnFileSelected(path);
   // Deletes |this|
 }
 
 void DownloadFilePicker::FileSelectionCanceled(void* params) {
-  RecordFilePickerResult(download_manager_, FILE_PICKER_CANCEL);
   OnFileSelected(base::FilePath());
   // Deletes |this|
 }
+
+// static
+void DownloadFilePicker::ShowFilePicker(DownloadItem* item,
+                                        const base::FilePath& suggested_path,
+                                        const FileSelectedCallback& callback) {
+  new DownloadFilePicker(item, suggested_path, callback);
+  // DownloadFilePicker deletes itself.
+}