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

chrome/browser/views/infobars/infobar_container.h

Index: chrome/browser/views/infobars/infobar_container.h
===================================================================
--- chrome/browser/views/infobars/infobar_container.h	(revision 23152)
+++ chrome/browser/views/infobars/infobar_container.h	(working copy)
@@ -53,14 +53,20 @@
   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.
Property changes on: chrome\browser\views\infobars\infobar_container.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/chrome/browser/views/infobars/infobar_container.h:r22711
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/views/infobars/infobar_container.h:r69-2775