Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/cocoa/infobars/infobar_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/infobars/infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 98 matching lines @@
 
 // Called when someone clicks on the close button.
 - (void)dismiss:(id)sender {
   if (![self isOwned])
     return;
   [self delegate]->InfoBarDismissed();
   [self removeSelf];
 }
 
 - (void)removeSelf {
-  infobar_->RemoveSelf();
+  infobar_->RemoveSelfCocoa();
 }
 
 - (void)addAdditionalControls {
   // Default implementation does nothing.
 }
 
-- (void)infobarWillHide {
-}
-
 - (void)infobarWillClose {
 }
 
 - (void)removeButtons {
   // Extend the label all the way across.
   NSRect labelFrame = [label_.get() frame];
   labelFrame.size.width = NSMaxX([cancelButton_ frame]) - NSMinX(labelFrame);
   [okButton_ removeFromSuperview];
   okButton_ = nil;
   [cancelButton_ removeFromSuperview];
   cancelButton_ = nil;
   [label_.get() setFrame:labelFrame];
 }
 
 - (void)layoutArrow {
   [infoBarView_ setArrowHeight:infobar_->arrow_height()];
   [infoBarView_ setArrowHalfWidth:infobar_->arrow_half_width()];
   [infoBarView_ setHasTip:![containerController_ shouldSuppressTopInfoBarTip]];
 
   // Convert from window to view coordinates.
   NSPoint point = NSMakePoint([containerController_ infobarArrowX], 0);
   point = [infoBarView_ convertPoint:point fromView:nil];
   [infoBarView_ setArrowX:point.x];
 }
 
 - (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];
   }
 }
 
 - (InfoBarDelegate*)delegate {
   return infobar_->delegate();
 }
 
 - (void)initializeLabel {
   // Replace the label placeholder NSTextField with the real label NSTextView.
   // The former doesn't show links in a nice way, but the latter can't be added
   // in IB without a containing scroll view, so create the NSTextView
   // programmatically.
   label_.reset([[HyperlinkTextView alloc]
       initWithFrame:[labelPlaceholder_ frame]]);
   [label_.get() setAutoresizingMask:[labelPlaceholder_ autoresizingMask]];
   [[labelPlaceholder_ superview]
       replaceSubview:labelPlaceholder_ with:label_.get()];
   labelPlaceholder_ = nil;  // Now released.
   [label_.get() setDelegate:self];
 }
 
 @end