Fix DCHECK() in infobar animation.

chrome/browser/ui/views/infobars/infobar_container.cc

 // Copyright (c) 2011 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/ui/views/infobars/infobar_container.h"
 
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/ui/views/infobars/infobar.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 
 InfoBarContainer::Delegate::~Delegate() {
 }
 
 InfoBarContainer::InfoBarContainer(Delegate* delegate)
     : delegate_(delegate),
       tab_contents_(NULL) {
 }
 
 InfoBarContainer::~InfoBarContainer() {
   // Before we remove any children, we reset |delegate_|, so that no removals
-  // will result in us trying to call delegate_->InfoBarContainerSizeChanged().
-  // This is important because at this point |delegate_| may be shutting down,
-  // and it's at best unimportant and at worst disastrous to call that.
+  // will result in us trying to call
+  // delegate_->InfoBarContainerHeightChanged().  This is important because at
+  // this point |delegate_| may be shutting down, and it's at best unimportant
+  // and at worst disastrous to call that.
   delegate_ = NULL;
   ChangeTabContents(NULL);
 }
 
 void InfoBarContainer::ChangeTabContents(TabContents* contents) {
   registrar_.RemoveAll();
 
   while (!infobars_.empty()) {
     InfoBar* infobar = *infobars_.begin();
     // NULL the container pointer first so that if the infobar is currently
@@ skipping 17 matching lines @@
 
     for (size_t i = 0; i < tab_contents_->infobar_count(); ++i) {
       // As when we removed the infobars above, we prevent callbacks to
       // OnInfoBarAnimated() for each infobar.
       AddInfoBar(tab_contents_->GetInfoBarDelegateAt(i)->CreateInfoBar(), false,
                  NO_CALLBACK);
     }
   }
 
   // Now that everything is up to date, signal the delegate to re-layout.
-  OnInfoBarAnimated(true);
+  OnInfoBarHeightChanged(true);
 }
 
-void InfoBarContainer::OnInfoBarAnimated(bool done) {
+void InfoBarContainer::OnInfoBarHeightChanged(bool is_animating) {
   if (delegate_)
-    delegate_->InfoBarContainerSizeChanged(!done);
+    delegate_->InfoBarContainerHeightChanged(is_animating);
 }
 
 void InfoBarContainer::RemoveDelegate(InfoBarDelegate* delegate) {
   tab_contents_->RemoveInfoBar(delegate);
 }
 
 void InfoBarContainer::RemoveInfoBar(InfoBar* infobar) {
   PlatformSpecificRemoveInfoBar(infobar);
   infobars_.erase(infobar);
 }
@@ skipping 46 matching lines @@
                                   bool animate,
                                   CallbackStatus callback_status) {
   infobars_.insert(infobar);
   PlatformSpecificAddInfoBar(infobar);
   if (callback_status == WANT_CALLBACK)
     infobar->set_container(this);
   infobar->Show(animate);
   if (callback_status == NO_CALLBACK)
     infobar->set_container(this);
 }