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

chrome/browser/extensions/extension_install_ui.cc

Index: chrome/browser/extensions/extension_install_ui.cc
===================================================================
--- chrome/browser/extensions/extension_install_ui.cc	(revision 23152)
+++ chrome/browser/extensions/extension_install_ui.cc	(working copy)
@@ -110,16 +110,22 @@
   if (!tab_contents)
     return;
 
-  // First remove any previous theme preview infobar.
+  // First find any previous theme preview infobars.
+  InfoBarDelegate* old_delegate = NULL;
   for (int i = 0; i < tab_contents->infobar_delegate_count(); ++i) {
     InfoBarDelegate* delegate = tab_contents->GetInfoBarDelegateAt(i);
     if (delegate->AsThemePreviewInfobarDelegate()) {
-      tab_contents->RemoveInfoBar(delegate);
+      old_delegate = delegate;
       break;
     }
   }
 
-  // Now add the new one.
-  tab_contents->AddInfoBar(new ThemePreviewInfobarDelegate(
-      tab_contents, extension->name()));
+  // Then either replace that old one or add a new one.
+  InfoBarDelegate* new_delegate = new ThemePreviewInfobarDelegate(tab_contents,
+      extension->name());
+
+  if (old_delegate)
+    tab_contents->ReplaceInfoBar(old_delegate, new_delegate);
+  else
+    tab_contents->AddInfoBar(new_delegate);
 }
Property changes on: chrome\browser\extensions\extension_install_ui.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/extensions/extension_install_ui.cc:r22711