Mac: Show download item menu on mouse down instead of mouse up.

chrome/browser/cocoa/download_item_controller.mm

 // Copyright (c) 2009 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/gfx/text_elider.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
@@ skipping 82 matching lines @@
 
     shelf_ = shelf;
     state_ = kNormal;
     creationTime_ = base::Time::Now();
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [progressView_ setController:nil];
   [[self view] removeFromSuperview];
   [super dealloc];
 }
 
 - (void)awakeFromNib {
+  [progressView_ setController:self];
+
   [self setStateFromDownload:bridge_->download_model()];
 
   GTMUILocalizerAndLayoutTweaker* localizerAndLayoutTweaker =
       [[[GTMUILocalizerAndLayoutTweaker alloc] init] autorelease];
   [localizerAndLayoutTweaker applyLocalizer:localizer_ tweakingUI:[self view]];
 
   // Since the shelf keeps laying out views as more items are added, relying on
   // the WidthBaseTweaker to resize the dangerous download part does not work.
   DCHECK(buttonTweaker_ != nil);
   CGFloat widthChange = [buttonTweaker_ changedWidth];
@@ skipping 39 matching lines @@
           IDS_PROMPT_DANGEROUS_DOWNLOAD, elidedFilename);
       confirmButtonTitle = l10n_util::GetNSStringWithFixup(IDS_SAVE_DOWNLOAD);
     }
     [dangerousDownloadLabel_ setStringValue:dangerousWarning];
     [dangerousDownloadConfirmButton_ setTitle:confirmButtonTitle];
     return;
   }
 
   // Set correct popup menu. Also, set draggable download on completion.
   if (downloadModel->download()->state() == DownloadItem::COMPLETE) {
-    currentMenu_ = completeDownloadMenu_;
+    [progressView_ setMenu:completeDownloadMenu_];
     [progressView_ setDownload:downloadModel->download()->full_path()];
   } else {
-    currentMenu_ = activeDownloadMenu_;
+    [progressView_ setMenu:activeDownloadMenu_];
   }
 
-  [progressView_ setMenu:currentMenu_];  // for context menu
   [cell_ setStateFromDownload:downloadModel];
 }
 
 - (void)setIcon:(NSImage*)icon {
   [cell_ setImage:icon];
 }
 
 - (void)remove {
   // We are deleted after this!
   [shelf_ remove:self];
 }
 
 - (void)updateVisibility:(id)sender {
   if ([[self view] window])
     [self updateTheme:[[self view] gtm_theme]];
 
   // 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 {
-  if ([cell_ isButtonPartPressed]) {
-    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);
-  } else {
-    // Hold a reference to ourselves in case the download completes and we
-    // represent a file that's auto-removed (e.g. a theme).
-    scoped_nsobject<DownloadItemController> ref([self retain]);
-    [NSMenu popUpContextMenu:currentMenu_
-                   withEvent:[NSApp currentEvent]
-                     forView:progressView_];
-  }
+  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);
 }
 
 - (NSSize)preferredSize {
   if (state_ == kNormal)
     return [progressView_ frame].size;
   DCHECK_EQ(kDangerous, state_);
   return [dangerousDownloadView_ frame].size;
 }
 
 - (DownloadItem*)download {
@@ skipping 104 matching lines @@
 
 - (IBAction)handleCancel:(id)sender {
   menuBridge_->ExecuteItemCommand(DownloadShelfContextMenuMac::CANCEL);
 }
 
 - (IBAction)handleTogglePause:(id)sender {
   menuBridge_->ExecuteItemCommand(DownloadShelfContextMenuMac::TOGGLE_PAUSE);
 }
 
 @end