Make infobars ignore button clicks when closing.

chrome/browser/ui/cocoa/translate/translate_infobar_base.mm

 // Copyright (c) 2011 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 <Cocoa/Cocoa.h>
 #import "chrome/browser/ui/cocoa/translate/translate_infobar_base.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_string_conversions.h"
@@ skipping 90 matching lines @@
     [item setTarget:target];
     if (checked)
       [item setState:NSOnState];
     if (!enabled)
       [item setEnabled:NO];
   }
 }
 
 }  // namespace TranslateInfoBarUtilities
 
-namespace {
-
-// Helper to close and disable popup menus when the infobar closes.
-// Disabling the popup button would cause a distracting visual change.
-void DisablePopUpMenu(NSMenu *menu) {
-  // Remove the menu if visible.
-  [menu cancelTracking];
-
-  // If the menu is re-opened, prevent queries to update items.
-  [menu setDelegate:nil];
-
-  // Prevent target/action messages to the controller.
-  for (NSMenuItem* item in [menu itemArray]) {
-    [item setEnabled:NO];
-    [item setTarget:nil];
-  }
-}
-
-}  // namespace
-
 // TranslateInfoBarDelegate views specific method:
 InfoBar* TranslateInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
   TranslateInfoBarControllerBase* infobar_controller = NULL;
   switch (type_) {
     case BEFORE_TRANSLATE:
       infobar_controller =
           [[BeforeTranslateInfobarController alloc] initWithDelegate:this
                                                                owner:owner];
       break;
     case AFTER_TRANSLATE:
@@ skipping 344 matching lines @@
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(didChangeFrame:)
              name:NSViewFrameDidChangeNotification
            object:infoBarView_];
   // Show and place GUI elements.
   [self updateState];
 }
 
 - (void)infobarWillClose {
-  DisablePopUpMenu([fromLanguagePopUp_ menu]);
-  DisablePopUpMenu([toLanguagePopUp_ menu]);
-  DisablePopUpMenu([optionsPopUp_ menu]);
+  [self disablePopUpMenu:[fromLanguagePopUp_ menu]];
+  [self disablePopUpMenu:[toLanguagePopUp_ menu]];
+  [self disablePopUpMenu:[optionsPopUp_ menu]];
   [super infobarWillClose];
 }
 
 - (void)adjustOptionsButtonSizeAndVisibilityForView:(NSView*)lastView {
   [optionsPopUp_ setHidden:NO];
   [self rebuildOptionsMenu:NO];
   [[optionsPopUp_ cell] setArrowPosition:NSPopUpArrowAtBottom];
   [optionsPopUp_ sizeToFit];
 
   MoveControl(closeButton_, optionsPopUp_, spaceBetweenControls_, false);
   if (!VerifyControlOrderAndSpacing(lastView, optionsPopUp_)) {
     [self rebuildOptionsMenu:YES];
     NSRect oldFrame = [optionsPopUp_ frame];
     oldFrame.size.width = NSHeight(oldFrame);
     [optionsPopUp_ setFrame:oldFrame];
     [[optionsPopUp_ cell] setArrowPosition:NSPopUpArrowAtCenter];
     MoveControl(closeButton_, optionsPopUp_, spaceBetweenControls_, false);
     if (!VerifyControlOrderAndSpacing(lastView, optionsPopUp_)) {
       [optionsPopUp_ setHidden:YES];
     }
   }
 }
 
 // Called when "Translate" button is clicked.
 - (IBAction)ok:(id)sender {
-  // The delegate may be NULL if the infobar was closed.
+  if (![self isOwned])
+    return;
   TranslateInfoBarDelegate* delegate = [self delegate];
-  if (delegate) {
-    TranslateInfoBarDelegate::Type state = delegate->type();
-    DCHECK(state == TranslateInfoBarDelegate::BEFORE_TRANSLATE ||
-           state == TranslateInfoBarDelegate::TRANSLATION_ERROR);
-    delegate->Translate();
-  }
+  TranslateInfoBarDelegate::Type state = delegate->type();
+  DCHECK(state == TranslateInfoBarDelegate::BEFORE_TRANSLATE ||
+         state == TranslateInfoBarDelegate::TRANSLATION_ERROR);
+  delegate->Translate();
   UMA_HISTOGRAM_COUNTS("Translate.Translate", 1);
 }
 
 // Called when someone clicks on the "Nope" button.
 - (IBAction)cancel:(id)sender {
-  // The delegate may be NULL if the infobar was closed.
+  if (![self isOwned])
+    return;
   TranslateInfoBarDelegate* delegate = [self delegate];
-  if (delegate) {
-    DCHECK(delegate->type() == TranslateInfoBarDelegate::BEFORE_TRANSLATE);
-    delegate->TranslationDeclined();
-    UMA_HISTOGRAM_COUNTS("Translate.DeclineTranslate", 1);
-  }
-  [super dismiss:nil];
+  DCHECK(delegate->type() == TranslateInfoBarDelegate::BEFORE_TRANSLATE);
+  delegate->TranslationDeclined();
+  UMA_HISTOGRAM_COUNTS("Translate.DeclineTranslate", 1);
+  [super removeSelf];
 }
 
 - (void)messageButtonPressed:(id)sender {
-  // The delegate may be NULL if the infobar was closed.
-  TranslateInfoBarDelegate* delegate = [self delegate];
-  if (delegate)
-    delegate->MessageInfoBarButtonPressed();
+  if (![self isOwned])
+    return;
+  [self delegate]->MessageInfoBarButtonPressed();
 }
 
 - (IBAction)showOriginal:(id)sender {
-  // The delegate may be NULL if the infobar was closed.
-  TranslateInfoBarDelegate* delegate = [self delegate];
-  if (delegate)
-    delegate->RevertTranslation();
+  if (![self isOwned])
+    return;
+  [self delegate]->RevertTranslation();
 }
 
 // Called when any of the language drop down menus are changed.
 - (void)languageMenuChanged:(id)item {
-  // The delegate may be NULL if the infobar was closed.
-  if (![self delegate])
+  if (![self isOwned])
     return;
   if ([item respondsToSelector:@selector(tag)]) {
     int cmd = [item tag];
     if (cmd >= IDC_TRANSLATE_TARGET_LANGUAGE_BASE) {
       cmd -= IDC_TRANSLATE_TARGET_LANGUAGE_BASE;
       [self targetLanguageModified:cmd];
       return;
     } else if (cmd >= IDC_TRANSLATE_ORIGINAL_LANGUAGE_BASE) {
       cmd -= IDC_TRANSLATE_ORIGINAL_LANGUAGE_BASE;
       [self sourceLanguageModified:cmd];
       return;
     }
   }
   NOTREACHED() << "Language menu was changed with a bad language ID";
 }
 
 // Called when the options menu is changed.
 - (void)optionsMenuChanged:(id)item {
+  if (![self isOwned])
+    return;
   if ([item respondsToSelector:@selector(tag)]) {
     int cmd = [item tag];
     // Danger Will Robinson! : This call can release the infobar (e.g. invoking
     // "About Translate" can open a new tab).
     // Do not access member variables after this line!
     optionsMenuModel_->ExecuteCommand(cmd);
   } else {
     NOTREACHED();
   }
 }
@@ skipping 82 matching lines @@
       return false;
     }
     previousControl = control;
   }
 
   return true;
 }
 
 @end // TranslateInfoBarControllerBase (TestingAPI)