Fix contextual menu crash by disabling the contextual menu.

BUG=http://crbug.com/42743
TEST=as in bug


Review URL: http://codereview.chromium.org/1687025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46099 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 10 deletions

diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index 7507166..811e3d6 100644
--- a/chrome/browser/cocoa/tab_view.mm
+++ b/chrome/browser/cocoa/tab_view.mm
@@ -75,9 +75,18 @@ const CGFloat kRapidCloseDist = 2.5;
   [super dealloc];
 }
 
-// Use the TabController to provide the menu rather than obtaining it from the
-// nib file.
+// Called to obtain the context menu for when the user hits the right mouse
+// button (or control-clicks). (Note that -rightMouseDown: is *not* called for
+// control-click.)
 - (NSMenu*)menu {
+  if ([self isClosing])
+    return nil;
+
+  // Sheets, being window-modal, should block contextual menus. For some reason
+  // they do not. Disallow them ourselves.
+  if ([[self window] attachedSheet])
+    return nil;
+
   return [controller_ menu];
 }
 
@@ -768,14 +777,6 @@ const CGFloat kRapidCloseDist = 2.5;
   [context restoreGraphicsState];
 }
 
-// Called when the user hits the right mouse button (or control-clicks) to
-// show a context menu.
-- (void)rightMouseDown:(NSEvent*)theEvent {
-  if ([self isClosing])
-    return;
-  [NSMenu popUpContextMenu:[self menu] withEvent:theEvent forView:self];
-}
-
 - (void)viewDidMoveToWindow {
   [super viewDidMoveToWindow];
   if ([self window]) {