Make DownloadHistory observe manager, items

chrome/browser/ui/gtk/download/download_item_gtk.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/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
@@ skipping 450 matching lines @@
 void DownloadItemGtk::OnLoadLargeIconComplete(IconManager::Handle handle,
                                               gfx::Image* image) {
   icon_large_ = image;
   DownloadItemDrag::SetSource(body_.get(), get_download(), icon_large_);
 }
 
 void DownloadItemGtk::LoadIcon() {
   icon_consumer_.CancelAllRequests();
   IconManager* im = g_browser_process->icon_manager();
   icon_filepath_ = get_download()->GetUserVerifiedFilePath();
+  if (icon_filepath_.empty()) return;

[Randy Smith (Not in Mondays), 2012/08/28 13:11:49]

Is this really part of this CL?

[benjhayden, 2012/09/10 19:02:56]

Done.

   im->LoadIcon(icon_filepath_,
                IconLoader::SMALL, &icon_consumer_,
                base::Bind(&DownloadItemGtk::OnLoadSmallIconComplete,
                           base::Unretained(this)));
   im->LoadIcon(icon_filepath_,
                IconLoader::LARGE, &icon_consumer_,
                base::Bind(&DownloadItemGtk::OnLoadLargeIconComplete,
                           base::Unretained(this)));
 }
 
@@ skipping 441 matching lines @@
   get_download()->DangerousDownloadValidated();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   if (get_download()->IsPartialDownload())
     get_download()->Cancel(true);
   get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
 }