Fix DCHECK() in infobar animation.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
 #pragma once
 
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 class InfoBar;
 class InfoBarDelegate;
 class TabContents;
 
 // InfoBarContainer is a cross-platform base class to handle the visibility-
 // related aspects of InfoBars.  While InfoBars own themselves, the
 // InfoBarContainer is responsible for telling particular InfoBars that they
 // should be hidden or visible.
 //
 // Platforms need to subclass this to implement a few platform-specific
 // functions, which are pure virtual here.
 class InfoBarContainer : public NotificationObserver {
  public:
-  // The delegate is notified each time InfoBarContainer::OnInfoBarAnimated() is
-  // called.
+  // The delegate is notified each time the infobar container changes height.
   class Delegate {
    public:
-    virtual void InfoBarContainerSizeChanged(bool is_animating) = 0;
+    virtual void InfoBarContainerHeightChanged(bool is_animating) = 0;
 
    protected:
     virtual ~Delegate();
   };
 
   explicit InfoBarContainer(Delegate* delegate);
   virtual ~InfoBarContainer();
 
   // Changes the TabContents for which this container is showing infobars.  This
   // will remove all current infobars from the container, add the infobars from
   // |contents|, and show them all.  |contents| may be NULL.
   void ChangeTabContents(TabContents* contents);
 
-  // Called when a contained infobar has animated.  The container is expected to
-  // do anything necessary to respond to the infobar's possible size change,
+  // Called when a contained infobar has animated or by some other means changed
+  // its height.  The container is expected to do anything necessary to respond,
   // e.g. re-layout.
-  void OnInfoBarAnimated(bool done);
+  void OnInfoBarHeightChanged(bool is_animating);
 
   // Remove the specified InfoBarDelegate from the selected TabContents. This
   // will notify us back and cause us to close the InfoBar.  This is called from
   // the InfoBar's close button handler.
   void RemoveDelegate(InfoBarDelegate* delegate);
 
   // Called by |infobar| to request that it be removed from the container, as it
   // is about to delete itself.  At this point, |infobar| should already be
   // hidden.
   void RemoveInfoBar(InfoBar* infobar);
 
+  // Return the amount by which to overlap the toolbar above, so that the
+  // InfoBars inside may draw anti-spoof arrows atop it.
+  virtual int GetVerticalOverlap() = 0;
+
  protected:
   // These must be implemented on each platform to e.g. adjust the visible
   // object hierarchy.
   virtual void PlatformSpecificAddInfoBar(InfoBar* infobar) = 0;
   virtual void PlatformSpecificRemoveInfoBar(InfoBar* infobar) = 0;
 
  private:
   typedef std::set<InfoBar*> InfoBars;
 
   // NotificationObserver:
@@ skipping 18 matching lines @@
 
   NotificationRegistrar registrar_;
   Delegate* delegate_;
   TabContents* tab_contents_;
   InfoBars infobars_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_