Adding active_downloads_ map.

chrome/browser/download/download_item.cc

 // Copyright (c) 2010 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_item.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
@@ skipping 312 matching lines @@
   }
 
   // Notify our observers that we are complete (the call to OnAllDataSaved()
   // set the state to complete but did not notify).
   UpdateObservers();
 
   // The download file is meant to be completed if both the filename is
   // finalized and the file data is downloaded. The ordering of these two
   // actions is indeterministic. Thus, if the filename is not finalized yet,
   // delay the notification.
-  if (name_finalized())
+  if (name_finalized()) {
     NotifyObserversDownloadFileCompleted();

[Paweł Hajdan Jr., 2011/01/05 08:11:16]

It is really weird that we have to notify *both* "regular" observers and the
download_manager_. Can we somehow unify those two? The current solution is very
error-prone, e.g. it's easy to forget to notify download_manager_.

+    download_manager_->OnDownloadFileCompleted(id());
+  }
 }
 
 void DownloadItem::Remove(bool delete_on_disk) {
   Cancel(true);
   state_ = REMOVING;
   if (delete_on_disk) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableFunction(&DeleteDownloadedFile, full_path_));
   }
@@ skipping 44 matching lines @@
   UpdateObservers();
 }
 
 void DownloadItem::OnNameFinalized() {
   name_finalized_ = true;
 
   // The download file is meant to be completed if both the filename is
   // finalized and the file data is downloaded. The ordering of these two
   // actions is indeterministic. Thus, if we are still in downloading the
   // file, delay the notification.
-  if (state() == DownloadItem::COMPLETE)
+  if (state() == DownloadItem::COMPLETE) {
     NotifyObserversDownloadFileCompleted();
+    download_manager_->OnDownloadFileCompleted(id());
+  }
 }
 
 void DownloadItem::OnSafeDownloadFinished(DownloadFileManager* file_manager) {
   DCHECK_EQ(SAFE, safety_state());
   DCHECK(file_manager);
   if (NeedsRename()) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(
             file_manager, &DownloadFileManager::OnFinalDownloadName,
@@ skipping 133 matching lines @@
         target_name_.value().c_str(),
         full_path().value().c_str());
   } else {
     description += base::StringPrintf(" url = \"%s\"", url().spec().c_str());
   }
 
   description += " }";
 
   return description;
 }