Merge 22711 - Fix a few bugs with the theme infobar:...

chrome/browser/views/infobars/infobar_container.h

 // Copyright (c) 2006-2008 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_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
 #define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
 
 #include "chrome/common/notification_registrar.h"
 #include "views/view.h"
 
@@ skipping 35 matching lines @@
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Constructs the InfoBars needed to reflect the state of the current
   // TabContents associated with this container. No animations are run during
   // this process.
   void UpdateInfoBars();
 
   // Adds an InfoBar for the specified delegate, in response to a notification
-  // from the selected TabContents. The InfoBar's appearance will be animated.
-  void AddInfoBar(InfoBarDelegate* delegate);
+  // from the selected TabContents. The InfoBar's appearance will be animated
+  // if |use_animation| is true.
+  void AddInfoBar(InfoBarDelegate* delegate, bool use_animation);
 
   // Removes an InfoBar for the specified delegate, in response to a
   // notification from the selected TabContents. The InfoBar's disappearance
-  // will be animated.
-  void RemoveInfoBar(InfoBarDelegate* delegate);
+  // will be animated if |use_animation| is true.
+  void RemoveInfoBar(InfoBarDelegate* delegate, bool use_animation);
+
+  // Replaces an InfoBar for the specified delegate with a new one. There is no
+  // animation.
+  void ReplaceInfoBar(InfoBarDelegate* old_delegate,
+                      InfoBarDelegate* new_delegate);
 
   NotificationRegistrar registrar_;
 
   // The BrowserView that hosts this InfoBarContainer.
   BrowserView* browser_view_;
 
   // The TabContents for which we are currently showing InfoBars.
   TabContents* tab_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);
 };
 
 #endif  // #ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_