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

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 861 matching lines @@
     infobar_delegates_.erase(it);
 
     // Remove ourselves as an observer if we are tracking no more InfoBars.
     if (infobar_delegates_.empty()) {
       registrar_.Remove(this, NotificationType::NAV_ENTRY_COMMITTED,
                         Source<NavigationController>(&controller_));
     }
   }
 }
 
+void TabContents::ReplaceInfoBar(InfoBarDelegate* old_delegate,
+                                 InfoBarDelegate* new_delegate) {
+  std::vector<InfoBarDelegate*>::iterator it =
+      find(infobar_delegates_.begin(), infobar_delegates_.end(), old_delegate);
+  DCHECK(it != infobar_delegates_.end());
+
+  // Notify the container about the change of plans.
+  scoped_ptr<std::pair<InfoBarDelegate*, InfoBarDelegate*> > details(
+    new std::pair<InfoBarDelegate*, InfoBarDelegate*>(
+        old_delegate, new_delegate));
+  NotificationService::current()->Notify(
+      NotificationType::TAB_CONTENTS_INFOBAR_REPLACED,
+      Source<TabContents>(this),
+      Details<std::pair<InfoBarDelegate*, InfoBarDelegate*> >(details.get()));
+
+  // Remove the old one.
+  infobar_delegates_.erase(it);
+
+  // Add the new one.
+  infobar_delegates_.push_back(new_delegate);
+}
+
 bool TabContents::IsBookmarkBarAlwaysVisible() {
   // See GetDOMUIForCurrentState() comment for more info. This case is very
   // similar, but for non-first loads, we want to use the committed entry. This
   // is so the bookmarks bar disappears at the same time the page does.
   if (controller_.GetLastCommittedEntry()) {
     // Not the first load, always use the committed DOM UI.
     if (render_manager_.dom_ui())
       return render_manager_.dom_ui()->force_bookmark_bar_visible();
     return false;  // Default.
   }
@@ skipping 1477 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }