Make DownloadHistory observe manager, items

chrome/browser/ui/webui/downloads_dom_handler.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/ui/webui/downloads_dom_handler.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/basictypes.h"
@@ skipping 161 matching lines @@
   // Get the id for the download. Our downloads are sorted latest to first,
   // and the id is the index into that list. We should be careful of sync
   // errors between the UI and the download_items_ list (we may wish to use
   // something other than 'id').
   OrderedDownloads::iterator it = std::find(download_items_.begin(),
                                             download_items_.end(),
                                             download);
   if (it == download_items_.end())
     return;
 
-  if (download->GetState() == content::DownloadItem::REMOVING) {
-    (*it)->RemoveObserver(this);
-    *it = NULL;
-    // A later ModelChanged() notification will change the WebUI's
-    // view of the downloads list.
-    return;
-  }
-
   const int id = static_cast<int>(it - download_items_.begin());
 
   ListValue results_value;
   results_value.Append(download_util::CreateDownloadItemValue(download, id));
   web_ui()->CallJavascriptFunction("downloadUpdated", results_value);
 }
 
+void DownloadsDOMHandler::OnDownloadDestroyed(
+    content::DownloadItem* download) {
+  download->RemoveObserver(this);
+  OrderedDownloads::iterator it = std::find(download_items_.begin(),
+                                            download_items_.end(),
+                                            download);
+  *it = NULL;
+  // A later ModelChanged() notification will change the WebUI's
+  // view of the downloads list.
+}
+
 // A download has started or been deleted. Query our DownloadManager for the
 // current set of downloads.
 void DownloadsDOMHandler::ModelChanged(content::DownloadManager* manager) {
   DCHECK(manager == download_manager_ ||
          manager == original_profile_download_manager_);
 
   ClearDownloadItems();
   download_manager_->SearchDownloads(WideToUTF16(search_text_),
                                      &download_items_);
   // If we have a parent DownloadManager, let it add its downloads to the
@@ skipping 14 matching lines @@
   }
 
   // Add ourself to all download items as an observer.
   for (OrderedDownloads::iterator it = download_items_.begin();
        it != download_items_.end(); ++it) {
     if (static_cast<int>(it - download_items_.begin()) > kMaxDownloads)
       break;
 
     // We should never see anything that isn't already in the history.
     DCHECK(*it);
-    DCHECK((*it)->IsPersisted());
 
     (*it)->AddObserver(this);
   }
 
   SendCurrentDownloads();
 }
 
 void DownloadsDOMHandler::ManagerGoingDown(content::DownloadManager* manager) {
   // This should never happen.  The lifetime of the DownloadsDOMHandler
   // is tied to the tab in which downloads.html is displayed, which cannot
@@ skipping 67 matching lines @@
   CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_PAUSE);
   content::DownloadItem* file = GetDownloadByValue(args);
   if (file)
     file->TogglePause();
 }
 
 void DownloadsDOMHandler::HandleRemove(const ListValue* args) {
   CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_REMOVE);
   content::DownloadItem* file = GetDownloadByValue(args);
   if (file) {
-    DCHECK(file->IsPersisted());
     file->Remove();
   }
 }
 
 void DownloadsDOMHandler::HandleCancel(const ListValue* args) {
   CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_CANCEL);
   content::DownloadItem* file = GetDownloadByValue(args);
   if (file)
     file->Cancel(true);
 }
@@ skipping 74 matching lines @@
 }
 
 content::DownloadItem* DownloadsDOMHandler::GetDownloadByValue(
     const ListValue* args) {
   int id;
   if (ExtractIntegerValue(args, &id)) {
     return GetDownloadById(id);
   }
   return NULL;
 }