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 28 matching lines @@
                               const base::FilePath& actual_path) {
   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;
+    const FileSelectedCallback& callback) : download_id_(0) {

[benjhayden, 2013/04/09 15:46:32]

Why not download_id_(item->GetId())?

[asanka, 2013/04/16 20:34:01]

Done.

+  download_manager_ =
+      content::BrowserContext::GetDownloadManager(item->GetBrowserContext());
   download_id_ = item->GetId();
   file_selected_callback_ = callback;
   InitSuggestedPath(item, suggested_path);
 
   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();
@@ skipping 21 matching lines @@
 
 DownloadFilePicker::~DownloadFilePicker() {
 }
 
 void DownloadFilePicker::InitSuggestedPath(
     DownloadItem* item,
     const base::FilePath& suggested_path) {
   set_suggested_path(suggested_path);
 }
 
-void DownloadFilePicker::OnFileSelected(const base::FilePath& path) {
-  file_selected_callback_.Run(path);
+void DownloadFilePicker::OnFileSelected(const base::FilePath& virtual_path,
+                                        const base::FilePath& local_path) {
+  file_selected_callback_.Run(virtual_path, local_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);
+  OnFileSelected(path, path);
   // Deletes |this|
 }
 
 void DownloadFilePicker::FileSelectionCanceled(void* params) {
   RecordFilePickerResult(download_manager_, FILE_PICKER_CANCEL);
-  OnFileSelected(base::FilePath());
+  OnFileSelected(base::FilePath(), base::FilePath());
   // Deletes |this|
 }
+
+#if !defined(OS_CHROMEOS)
+// static
+void DownloadFilePicker::ShowFilePicker(DownloadItem* item,
+                                        const base::FilePath& suggested_path,
+                                        const FileSelectedCallback& callback) {
+  new DownloadFilePicker(item, suggested_path, callback);
+  // DownloadFilePicker deletes itself.
+}
+#endif