Preliminary work on resuming downloads whose connections have expired.

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 304 matching lines @@
   // 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()->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);
+  DownloadItem* download = bridge_->download_model()->download();
+  if (download->IsPartialDownload())
+    download->Cancel(true);
+  download->Remove(true);
   // WARNING: we are deleted at this point.  Don't access 'this'.
 }
 
 
 // Sets the enabled and checked state of a particular menu item for this
 // download. We translate the NSMenuItem selection to menu selections understood
 // by the non platform specific download context menu.
 - (BOOL)validateMenuItem:(NSMenuItem *)item {
   SEL action = [item action];
 
@@ skipping 44 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