Download code cleanup:

chrome/browser/cocoa/download_item_controller.mm

 // 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.
 
 #import "chrome/browser/cocoa/download_item_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/histogram.h"
@@ skipping 226 matching lines @@
 
   // TODO(thakis): Make this prettier, by fading the items out or overlaying
   // the partial visible one with a horizontal alpha gradient -- crbug.com/17830
   NSView* view = [self view];
   NSRect containerFrame = [[view superview] frame];
   [view setHidden:(NSMaxX([view frame]) > NSWidth(containerFrame))];
 }
 
 - (IBAction)handleButtonClick:(id)sender {
   DownloadItem* download = bridge_->download_model()->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);
+  download->OpenDownload();
 }
 
 - (NSSize)preferredSize {
   if (state_ == kNormal)
     return [progressView_ frame].size;
   DCHECK_EQ(kDangerous, state_);
   return [dangerousDownloadView_ frame].size;
 }
 
 - (DownloadItem*)download {
@@ skipping 50 matching lines @@
       themeProvider->GetNSColor(BrowserThemeProvider::COLOR_TAB_TEXT, true);
   [dangerousDownloadLabel_ setTextColor:color];
 }
 
 - (IBAction)saveDownload:(id)sender {
   // The user has confirmed a dangerous download.  We record how quickly the
   // user did this to detect whether we're being clickjacked.
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download",
                            base::Time::Now() - creationTime_);
   // This will change the state and notify us.
-  bridge_->download_model()->download()->manager()->DangerousDownloadValidated(
-      bridge_->download_model()->download());
+  bridge_->download_model()->download()->DangerousDownloadValidated();
 }
 
 - (IBAction)discardDownload:(id)sender {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creationTime_);
   if (bridge_->download_model()->download()->state() ==
       DownloadItem::IN_PROGRESS)
     bridge_->download_model()->download()->Cancel(true);
   bridge_->download_model()->download()->Remove(true);
   // WARNING: we are deleted at this point.  Don't access 'this'.
@@ skipping 53 matching lines @@
     [sender setTitle:l10n_util::GetNSStringWithFixup(
         IDS_DOWNLOAD_MENU_PAUSE_ITEM)];
   } else {
     [sender setTitle:l10n_util::GetNSStringWithFixup(
         IDS_DOWNLOAD_MENU_RESUME_ITEM)];
   }
   menuBridge_->ExecuteCommand(DownloadShelfContextMenuMac::TOGGLE_PAUSE);
 }
 
 @end