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 72 matching lines @@
 
 void ShellDownloadManagerDelegate::RestartDownload(
     int32 download_id,
     const FilePath& suggested_path) {
   DownloadItem* download =
       download_manager_->GetActiveDownloadItem(download_id);
   if (!download)
     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);
+  ChooseDownloadPath(download, suggested_path);

[Randy Smith (Not in Mondays), 2012/07/10 18:33:09]

Any reason not to hoist the code in ChooseDownloadPath() up here?  We don't
really do anything else in this function, it's not called from anywhere else,
and it'd remove a function.  (Suggestion, not request.)

[asanka, 2012/07/11 20:03:32]

I left it out since we might need to override it for testing.

 }
 
-void ShellDownloadManagerDelegate::ChooseDownloadPath(DownloadItem* item) {
+void ShellDownloadManagerDelegate::ChooseDownloadPath(
+    DownloadItem* item,
+    const FilePath& suggested_path) {
   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());
+    item->Cancel(true);
   } else {
-    download_manager_->FileSelected(result, item->GetId());
+    item->OnTargetPathDetermined(result,
+                                 DownloadItem::TARGET_DISPOSITION_PROMPT,
+                                 content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS);
+    download_manager_->RestartDownload(download_id);
   }
 }
 
 }  // namespace content