Download filename determination refactor (3/3)

content/shell/shell_download_manager_delegate.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 "content/shell/shell_download_manager_delegate.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commdlg.h>
 #endif
@@ skipping 17 matching lines @@
 
 ShellDownloadManagerDelegate::~ShellDownloadManagerDelegate(){
 }
 
 
 void ShellDownloadManagerDelegate::SetDownloadManager(
     DownloadManager* download_manager) {
   download_manager_ = download_manager;
 }
 
-bool ShellDownloadManagerDelegate::ShouldStartDownload(int32 download_id) {
-  DownloadItem* download =
-      download_manager_->GetActiveDownloadItem(download_id);
-
+bool ShellDownloadManagerDelegate::DetermineDownloadTarget(
+    DownloadItem* download,
+    const DownloadTargetCallback& callback) {
   if (!download->GetForcedFilePath().empty()) {
-    download->OnTargetPathDetermined(
-        download->GetForcedFilePath(),
-        DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-        content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS);
+    callback.Run(download->GetForcedFilePath(),
+                 DownloadItem::TARGET_DISPOSITION_OVERWRITE,
+                 content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+                 download->GetForcedFilePath());
     return true;
   }
 
   FilePath generated_name = net::GenerateFileName(
       download->GetURL(),
       download->GetContentDisposition(),
       download->GetReferrerCharset(),
       download->GetSuggestedFilename(),
       download->GetMimeType(),
       "download");
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(
           &ShellDownloadManagerDelegate::GenerateFilename,
-          this, download_id, generated_name));
+          this, download->GetId(), callback, generated_name));
   return false;
 }
 
 void ShellDownloadManagerDelegate::GenerateFilename(
     int32 download_id,
+    const DownloadTargetCallback& callback,
     const FilePath& generated_name) {
   FilePath suggested_path = download_manager_->GetBrowserContext()->GetPath().
       Append(FILE_PATH_LITERAL("Downloads"));
   if (!file_util::PathExists(suggested_path))
     file_util::CreateDirectory(suggested_path);
 
   suggested_path = suggested_path.Append(generated_name);
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(
-          &ShellDownloadManagerDelegate::RestartDownload,
-          this, download_id, suggested_path));
+          &ShellDownloadManagerDelegate::ChooseDownloadPath,
+          this, download_id, callback, suggested_path));
 }
 
-void ShellDownloadManagerDelegate::RestartDownload(
+void ShellDownloadManagerDelegate::ChooseDownloadPath(
     int32 download_id,
+    const DownloadTargetCallback& callback,
     const FilePath& suggested_path) {
-  DownloadItem* download =
+  DownloadItem* item =
       download_manager_->GetActiveDownloadItem(download_id);
-  if (!download)
+  if (!item)
     return;
 
-  // Since we have no download UI, show the user a dialog always.
-  download->OnTargetPathDetermined(suggested_path,
-                                   DownloadItem::TARGET_DISPOSITION_PROMPT,
-                                   content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS);
-  download_manager_->RestartDownload(download_id);
-}
-
-void ShellDownloadManagerDelegate::ChooseDownloadPath(DownloadItem* item) {
   FilePath result;
 #if defined(OS_WIN) && !defined(USE_AURA)
-  const FilePath suggested_path(item->GetTargetFilePath());
   std::wstring file_part = FilePath(suggested_path).BaseName().value();
   wchar_t file_name[MAX_PATH];
   base::wcslcpy(file_name, file_part.c_str(), arraysize(file_name));
   OPENFILENAME save_as;
   ZeroMemory(&save_as, sizeof(save_as));
   save_as.lStructSize = sizeof(OPENFILENAME);
   save_as.hwndOwner = item->GetWebContents()->GetNativeView();
   save_as.lpstrFile = file_name;
   save_as.nMaxFile = arraysize(file_name);
 
   std::wstring directory;
   if (!suggested_path.empty())
     directory = suggested_path.DirName().value();
 
   save_as.lpstrInitialDir = directory.c_str();
   save_as.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER | OFN_ENABLESIZING |
                   OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST;
 
   if (GetSaveFileName(&save_as))
     result = FilePath(std::wstring(save_as.lpstrFile));
 #else
   NOTIMPLEMENTED();
 #endif
 
-  if (result.empty()) {
-    download_manager_->FileSelectionCanceled(item->GetId());
-  } else {
-    download_manager_->FileSelected(result, item->GetId());
-  }
+  callback.Run(result, DownloadItem::TARGET_DISPOSITION_PROMPT,
+               content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, result);
 }
 
 }  // namespace content