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

chrome/browser/views/infobars/infobar_container.cc

 // 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.
 
 #include "chrome/browser/views/infobars/infobar_container.h"
 
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/infobars/infobars.h"
@@ skipping 20 matching lines @@
   // hierarchy does this automatically (see InfoBar::InfoBarRemoved).
   RemoveAllChildViews(false);
   tab_contents_ = contents;
   if (tab_contents_) {
     UpdateInfoBars();
     Source<TabContents> tc_source(tab_contents_);
     registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_ADDED,
                    tc_source);
     registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
                    tc_source);
+    registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REPLACED,
+                   tc_source);
   }
 }
 
 void InfoBarContainer::InfoBarAnimated(bool completed) {
   if (browser_view_)
     browser_view_->SelectedTabToolbarSizeChanged(!completed);
 }
 
 void InfoBarContainer::RemoveDelegate(InfoBarDelegate* delegate) {
   tab_contents_->RemoveInfoBar(delegate);
@@ skipping 30 matching lines @@
     browser_view_->SelectedTabToolbarSizeChanged(false);
   }
 }
 
 // InfoBarContainer, NotificationObserver implementation: ----------------------
 
 void InfoBarContainer::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   if (type == NotificationType::TAB_CONTENTS_INFOBAR_ADDED) {
-    AddInfoBar(Details<InfoBarDelegate>(details).ptr());
+    AddInfoBar(Details<InfoBarDelegate>(details).ptr(), true);  // animated
   } else if (type == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED) {
-    RemoveInfoBar(Details<InfoBarDelegate>(details).ptr());
+    RemoveInfoBar(Details<InfoBarDelegate>(details).ptr(), true);  // animated
+  } else if (type == NotificationType::TAB_CONTENTS_INFOBAR_REPLACED) {
+    std::pair<InfoBarDelegate*, InfoBarDelegate*>* delegates =
+        Details<std::pair<InfoBarDelegate*, InfoBarDelegate*> >(details).ptr();
+    ReplaceInfoBar(delegates->first, delegates->second);
   } else {
     NOTREACHED();
   }
 }
 
 // InfoBarContainer, private: --------------------------------------------------
 
 void InfoBarContainer::UpdateInfoBars() {
   for (int i = 0; i < tab_contents_->infobar_delegate_count(); ++i) {
     InfoBarDelegate* delegate = tab_contents_->GetInfoBarDelegateAt(i);
     InfoBar* infobar = delegate->CreateInfoBar();
     infobar->set_container(this);
     AddChildView(infobar);
     infobar->Open();
   }
 }
 
-void InfoBarContainer::AddInfoBar(InfoBarDelegate* delegate) {
+void InfoBarContainer::AddInfoBar(InfoBarDelegate* delegate,
+                                  bool use_animation) {
   InfoBar* infobar = delegate->CreateInfoBar();
   infobar->set_container(this);
-  infobar->AnimateOpen();
   AddChildView(infobar);
+
+  if (use_animation)
+    infobar->AnimateOpen();
+  else
+    infobar->Open();
 }
 
-void InfoBarContainer::RemoveInfoBar(InfoBarDelegate* delegate) {
+void InfoBarContainer::RemoveInfoBar(InfoBarDelegate* delegate,
+                                     bool use_animation) {
   int index = 0;
   for (; index < tab_contents_->infobar_delegate_count(); ++index) {
     if (tab_contents_->GetInfoBarDelegateAt(index) == delegate)
       break;
   }
 
-  // The View will be removed once the Close animation completes.
-  static_cast<InfoBar*>(GetChildViewAt(index))->AnimateClose();
+  InfoBar* infobar = static_cast<InfoBar*>(GetChildViewAt(index));
+  if (use_animation) {
+    // The View will be removed once the Close animation completes.
+    infobar->AnimateClose();
+  } else {
+    infobar->Close();
+  }
 }
+
+void InfoBarContainer::ReplaceInfoBar(InfoBarDelegate* old_delegate,
+                                      InfoBarDelegate* new_delegate) {
+  RemoveInfoBar(old_delegate, false);  // no animation
+  AddInfoBar(new_delegate, false);  // no animation
+}