Fix BaseBubbleController close issue.

chrome/browser/ui/cocoa/base_bubble_controller.mm

 // Copyright (c) 2012 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/ui/cocoa/base_bubble_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
@@ skipping 223 matching lines @@
     return;
 
   NSWindow* window = self.window;
   NSNotification* note =
       [NSNotification notificationWithName:NSWindowDidResignKeyNotification
                                     object:window];
 
   // The eventTap_ catches clicks within the application that are outside the
   // window.
   eventTap_ = [NSEvent
-      addLocalMonitorForEventsMatchingMask:NSLeftMouseDownMask
+      addLocalMonitorForEventsMatchingMask:NSLeftMouseDownMask |
+                                           NSRightMouseDownMask
       handler:^NSEvent* (NSEvent* event) {
           if (event.window != window) {
-            // Call via the runloop because this block is called in the
-            // middle of event dispatch.
-            [self performSelector:@selector(windowDidResignKey:)
-                       withObject:note
-                       afterDelay:0];
-          }
+            // Do it right now, because if this event is right mouse event,
+            // it may pop up a menu. windowDidResignKey: will not exec until

[Robert Sesek, 2014/06/05 14:22:50]

nit: exec -> execute/run. We don't abbreviate in comments.

+            // the menu is closed.
+            if ([self respondsToSelector:@selector(windowDidResignKey:)]) {
+              [self windowDidResignKey:note];
+            }
+         }

[Robert Sesek, 2014/06/05 14:22:50]

nit: indent 1 more space

           return event;
       }];
 
   // The resignationObserver_ watches for when a window resigns key state,
   // meaning the key window has changed and the bubble should be dismissed.
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   resignationObserver_ =
       [center addObserverForName:NSWindowDidResignKeyNotification
                           object:nil
                            queue:[NSOperationQueue mainQueue]
@@ skipping 64 matching lines @@
 
 - (void)activateTabWithContents:(content::WebContents*)newContents
                previousContents:(content::WebContents*)oldContents
                         atIndex:(NSInteger)index
                          reason:(int)reason {
   // The user switched tabs; close.
   [self close];
 }
 
 @end  // BaseBubbleController