Change InfoBar-related notifications to be sourced from a TabContentsWrapper, not a TabContents. ...

chrome/browser/ui/cocoa/infobars/infobar_container_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_CONTAINER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_CONTAINER_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/view_resizer.h"
 #include "content/common/notification_registrar.h"
 
 @class InfoBarController;
+class InfoBar;
 class InfoBarDelegate;
 class InfoBarNotificationObserver;
 class TabContentsWrapper;
 class TabStripModel;
 
 // Protocol for basic container methods, as needed by an InfoBarController.
 // This protocol exists to make mocking easier in unittests.
 @protocol InfoBarContainer
 - (void)removeDelegate:(InfoBarDelegate*)delegate;
 - (void)willRemoveController:(InfoBarController*)controller;
@@ skipping 75 matching lines @@
 // Returns the amount of additional height the container view needs to draw the
 // anti-spoofing tip. This will return 0 if |-infobarCount| is 0. This is the
 // total amount of overlap for all infobars.
 - (CGFloat)antiSpoofHeight;
 
 @end
 
 
 @interface InfoBarContainerController (ForTheObserverAndTesting)
 
-// Adds an infobar view for the given delegate.
-- (void)addInfoBar:(InfoBarDelegate*)delegate animate:(BOOL)animate;
+// Adds the given infobar.  Takes ownership of |infobar|.
+- (void)addInfoBar:(InfoBar*)infobar
+    animate:(BOOL)animate
+    deleteImmediately:(BOOL)deleteImmediately;
 
 // Closes all the infobar views for a given delegate, either immediately or by
 // starting a close animation.
 - (void)closeInfoBarsForDelegate:(InfoBarDelegate*)delegate
                          animate:(BOOL)animate;
 
-// Replaces all info bars for the delegate with a new info bar.
-// This simply calls closeInfoBarsForDelegate: and then addInfoBar:.
-- (void)replaceInfoBarsForDelegate:(InfoBarDelegate*)old_delegate
-                              with:(InfoBarDelegate*)new_delegate;
-
 // Positions the infobar views in the container view and notifies
 // |browser_controller_| that it needs to resize the container view.
 - (void)positionInfoBarsAndRedraw;
 
 @end
 
 
 @interface InfoBarContainerController (JustForTesting)
 
 // Removes all infobar views.  Infobars which were already closing will be
 // completely closed (i.e. InfobarDelegate::InfoBarClosed() will be called and
 // we'll get a callback to removeController).  Other infobars will simply stop
 // animating and disappear.  Callers must call positionInfoBarsAndRedraw()
 // after calling this method.
 - (void)removeAllInfoBars;
 
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_CONTAINER_CONTROLLER_H_