Add files saved using 'Save page as' to the download history....

chrome/browser/download/save_package.cc

 // Copyright (c) 2011 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/save_package.h"
 
 #include <algorithm>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "base/string_split.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
+#include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/download/save_file.h"
 #include "chrome/browser/download/save_file_manager.h"
 #include "chrome/browser/download/save_item.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 307 matching lines @@
 
   // Initialize the request context and resource dispatcher.
   Profile* profile = tab_contents_->profile();
   if (!profile) {
     NOTREACHED();
     return false;
   }
 
   request_context_getter_ = profile->GetRequestContext();
 
-  // Create the fake DownloadItem and display the view.
-  DownloadManager* download_manager =
-      tab_contents_->profile()->GetDownloadManager();
-  download_ = new DownloadItem(download_manager,
-                               saved_main_file_path_,
-                               page_url_,
-                               profile->IsOffTheRecord());
-
-  // Transfer the ownership to the download manager. We need the DownloadItem
-  // to be alive as long as the Profile is alive.
-  download_manager->SavePageAsDownloadStarted(download_);
+  // Create the fake DownloadItem and add it to the download history.
+  CreateDownloadItem(saved_main_file_path_,
+                     page_url_,
+                     profile->IsOffTheRecord());
 
   tab_contents_->OnStartDownload(download_);
 
   // Check save type and process the save page job.
   if (save_type_ == SAVE_AS_COMPLETE_HTML) {
     // Get directory
     DCHECK(!saved_main_directory_path_.empty());
     GetAllSavableResourceLinksForCurrentPage();
   } else {
     wait_state_ = NET_FILES;
     SaveFileCreateInfo::SaveFileSource save_source = page_url_.SchemeIsFile() ?
         SaveFileCreateInfo::SAVE_FILE_FROM_FILE :
         SaveFileCreateInfo::SAVE_FILE_FROM_NET;
     SaveItem* save_item = new SaveItem(page_url_,
                                        GURL(),
                                        this,
                                        save_source);
     // Add this item to waiting list.
     waiting_item_queue_.push(save_item);
     all_save_items_count_ = 1;
     download_->set_total_bytes(1);
 
     DoSavingProcess();
   }
 
   return true;
 }
 
+void SavePackage::OnDownloadEntryAdded(DownloadCreateInfo info,
+                                       int64 db_handle) {
+  DownloadManager* download_manager =
+      tab_contents_->profile()->GetDownloadManager();
+
+  download_manager->AddDownloadItemToHistory(download_, db_handle);
+}
+
+void SavePackage::CreateDownloadItem(const FilePath& path,
+                                     const GURL& url,
+                                     bool is_otr) {
+  DownloadManager* download_manager =
+      tab_contents_->profile()->GetDownloadManager();
+
+  DownloadItem* item = new DownloadItem(download_manager, path, url, is_otr);

[Paweł Hajdan Jr., 2011/02/11 19:17:49]

nit: If it's going to be stored on |item_| anyway, why have the temporary
|item|?

[magnus, 2011/02/13 03:32:41]

Done.

+  download_ = item;
+  // Transfer the ownership to the download manager. We need the DownloadItem
+  // to be alive as long as the Profile is alive.
+  download_manager->SavePageAsDownloadStarted(item);
+  // Copy over the fields used by the history service
+  DownloadCreateInfo info(item->full_path(),
+                          item->url(),
+                          item->start_time(),
+                          0, 0,
+                          item->state(),
+                          item->id(),
+                          false);
+  DownloadHistory* download_history = download_manager->download_history();
+  // Add entry to the history service

[Paweł Hajdan Jr., 2011/02/11 19:17:49]

nit: Dot at the end. Also, please add a blank line above each comment, including
above.

[magnus, 2011/02/13 03:32:41]

Done.

+  download_history->AddEntry(info, download_,
+      NewCallback(this, &SavePackage::OnDownloadEntryAdded));
+}
+
 // Generate name for saving resource.
 bool SavePackage::GenerateFileName(const std::string& disposition,
                                    const GURL& url,
                                    bool need_html_ext,
                                    FilePath::StringType* generated_name) {
   // TODO(jungshik): Figure out the referrer charset when having one
   // makes sense and pass it to GetSuggestedFilename.
   string16 suggested_name =
       net::GetSuggestedFilename(url, disposition, "",
                                 ASCIIToUTF16(kDefaultSaveName));
@@ skipping 257 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &SaveFileManager::RemoveSavedFileFromFileMap,
                         save_ids));
 
   finished_ = true;
   wait_state_ = FAILED;
 
   // Inform the DownloadItem we have canceled whole save page job.
+  DownloadManager* download_manager =
+      tab_contents_->profile()->GetDownloadManager();
   download_->Cancel(false);
+  // Remove DownloadItem from history.
+  download_manager->download_history()->RemoveEntry(download_);

[Randy Smith (Not in Mondays), 2011/02/11 19:10:07]

I'm ok with the difference in behavior, but this is a difference in behavior
between downloads and save package activities.  downloads are left in the
history when cancelled (unless they're dangerous).  See for instance
DownloadManager::DownloadCancelled.

[magnus, 2011/02/13 03:32:41]

Changed it to keep the download in the history.

 }
 
 void SavePackage::CheckFinish() {
   if (in_process_count() || finished_)
     return;
 
   FilePath dir = (save_type_ == SAVE_AS_COMPLETE_HTML &&
                   saved_success_items_.size() > 1) ?
                   saved_main_directory_path_ : FilePath();
 
@@ skipping 32 matching lines @@
   for (SaveUrlItemMap::iterator it = saved_failed_items_.begin();
        it != saved_failed_items_.end(); ++it)
     save_ids.push_back(it->second->save_id());
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &SaveFileManager::RemoveSavedFileFromFileMap,
                         save_ids));
 
-  download_->OnAllDataSaved(all_save_items_count_);
-  download_->MarkAsComplete();
+  DownloadItem* item = download_;

[Randy Smith (Not in Mondays), 2011/02/11 19:10:07]

What's the value of the local variable rather than using download_?

[magnus, 2011/02/13 03:32:41]

Removed local variable.

+  item->OnAllDataSaved(all_save_items_count_);
+  item->MarkAsComplete();
   // Notify download observers that we are complete (the call
   // to OnReadyToFinish() set the state to complete but did not notify).
-  download_->UpdateObservers();
+  item->UpdateObservers();
+  // Update the download history

[Paweł Hajdan Jr., 2011/02/11 19:17:49]

nit: Dot at the end.

[magnus, 2011/02/13 03:32:41]

Done.

+  DownloadManager* download_manager =
+      tab_contents_->profile()->GetDownloadManager();
+  download_manager->download_history()->UpdateEntry(item);
 
   NotificationService::current()->Notify(
       NotificationType::SAVE_PACKAGE_SUCCESSFULLY_FINISHED,
       Source<SavePackage>(this),
       Details<GURL>(&page_url_));
 }
 
 // Called for updating end state.
 void SavePackage::SaveFinished(int32 save_id, int64 size, bool is_success) {
   // Because we might have canceled this saving job before,
@@ skipping 697 matching lines @@
 }
 
 // SelectFileDialog::Listener interface.
 void SavePackage::FileSelected(const FilePath& path,
                                int index, void* params) {
   ContinueSave(path, index);
 }
 
 void SavePackage::FileSelectionCanceled(void* params) {
 }