Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/cocoa/infobars/infobar_controller.h

 // 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 <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/weak_ptr.h"
 
 @protocol InfoBarContainerControllerBase;
@@ skipping 54 matching lines @@
 // Asks the container controller to remove the infobar for this delegate.  This
 // call will trigger a notification that starts the infobar animating closed.
 - (void)removeSelf;
 
 // Subclasses can override this method to add additional controls to
 // the infobar view.  This method is called by awakeFromNib.  The
 // default implementation does nothing.
 - (void)addAdditionalControls;
 
 // Subclasses must override this method to perform cleanup just before the
-// infobar hides.
-- (void)infobarWillHide;
-
-// Subclasses must override this method to perform cleanup just before the
 // infobar closes.
 - (void)infobarWillClose;
 
 // Removes the OK and Cancel buttons and resizes the textfield to use the
 // space.
 - (void)removeButtons;
 
 // Updates the view's arrow position.
 - (void)layoutArrow;
 
 @end
 
 @interface InfoBarController (Protected)
-// Disables the provided menu.  Subclasses should call this for each popup menu
-// in -infobarWillClose.
+// Closes and disables the provided menu.  Subclasses should call this for each
+// popup menu in -infobarWillClose.
 - (void)disablePopUpMenu:(NSMenu*)menu;
 @end
 
 /////////////////////////////////////////////////////////////////////////
 // InfoBarController subclasses, one for each InfoBarDelegate
 // subclass.  Each of these subclasses overrides addAdditionalControls to
 // configure its view as necessary.