Download code cleanup:

chrome/browser/gtk/download_item_gtk.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/gtk/download_item_gtk.h"
 
 #include "app/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/menus/simple_menu_model.h"
 #include "app/resource_bundle.h"
@@ skipping 763 matching lines @@
   GtkWidget* child = gtk_bin_get_child(GTK_BIN(widget));
   if (child)
     gtk_container_propagate_expose(GTK_CONTAINER(widget), child, e);
 
   return TRUE;
 }
 
 void DownloadItemGtk::OnClick(GtkWidget* widget) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
                            base::Time::Now() - creation_time_);
-
-  DownloadItem* download = get_download();
-
-  if (download->state() == DownloadItem::IN_PROGRESS) {
-    download->set_open_when_complete(
-        !download->open_when_complete());
-  } else if (download->state() == DownloadItem::COMPLETE) {
-    download_util::OpenDownload(download);
-  }
+  get_download()->OpenDownload();
 }
 
 gboolean DownloadItemGtk::OnProgressAreaExpose(GtkWidget* widget,
                                                GdkEventExpose* event) {
   // Create a transparent canvas.
   gfx::CanvasSkiaPaint canvas(event, false);
   if (complete_animation_.get()) {
     if (complete_animation_->is_animating()) {
       download_util::PaintDownloadComplete(&canvas,
           widget->allocation.x, widget->allocation.y,
@@ skipping 48 matching lines @@
   if (!theme_provider_->UseGtkTheme()) {
     // The hbox renderer will take care of the border when in GTK mode.
     dangerous_nine_box_->RenderToWidget(widget);
   }
   return FALSE;  // Continue propagation.
 }
 
 void DownloadItemGtk::OnDangerousAccept(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download",
                            base::Time::Now() - creation_time_);
-  get_download()->manager()->DangerousDownloadValidated(get_download());
+  get_download()->DangerousDownloadValidated();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   if (get_download()->state() == DownloadItem::IN_PROGRESS)
     get_download()->Cancel(true);
   get_download()->Remove(true);
 }