Fix DCHECK() in infobar animation.

chrome/browser/ui/views/infobars/infobar_view.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_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_
 #pragma once
 
 #include "base/task.h"
 #include "chrome/browser/ui/views/infobars/infobar.h"
@@ skipping 17 matching lines @@
 class InfoBarView : public InfoBar,
                     public views::View,
                     public views::ButtonListener,
                     public views::FocusChangeListener {
  public:
   explicit InfoBarView(InfoBarDelegate* delegate);
 
   SkPath* fill_path() const { return fill_path_.get(); }
   SkPath* stroke_path() const { return stroke_path_.get(); }
 
-  int AnimatedTabHeight() const;
+  int tab_height() const { return tab_height_; }
 
  protected:
   // The target height of the InfoBar, regardless of what its current height
   // is (due to animation).
   static const int kDefaultTargetHeight;
   static const int kButtonButtonSpacing;
   static const int kEndOfLabelSpacing;
 
   virtual ~InfoBarView();
 
@@ skipping 24 matching lines @@
 
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) OVERRIDE;
 
   // Returns the minimum width the content (that is, everything between the icon
   // and the close button) can be shrunk to.  This is used to prevent the close
   // button from overlapping views that cannot be shrunk any further.
   virtual int ContentMinimumWidth() const;
 
-  void set_target_height(int height) { target_height_ = height; }
+  // Changes the target height of the main ("bar") portion of the infobar.
+  void SetTargetHeight(int height);
 
   // These return x coordinates delimiting the usable area for subclasses to lay
   // out their controls.
   int StartX() const;
   int EndX() const;
 
   // Given a control with size |prefsize|, returns the centered y position
   // within us, taking into account animation so the control "slides in" (or
   // out) as we animate open and closed.
   int OffsetY(const gfx::Size prefsize) const;
 
  private:
   static const int kCurveWidth;
   static const int kHorizontalPadding;
   static const int kMaxIconWidth;
   static const int kTabHeight;
   static const int kTabIconPadding;
   static const int kTabWidth;
 
   // InfoBar:
   virtual void PlatformSpecificHide(bool animate) OVERRIDE;
+  virtual void PlatformSpecificRecalculateHeight() OVERRIDE;
 
   // views::View:
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
   virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
 
   // views::FocusChangeListener:
   virtual void FocusWillChange(View* focused_before,
                                View* focused_now) OVERRIDE;
 
   // Returns a centered y-position of a control of height specified in
   // |prefsize| within the standard InfoBar height. Stable during an animation.
   int CenterY(const gfx::Size prefsize) const;
 
-  int AnimatedBarHeight() const;
-
   // Destroys the external focus tracker, if present. If |restore_focus| is
   // true, restores focus to the view tracked by the focus tracker before doing
   // so.
   void DestroyFocusTracker(bool restore_focus);
 
   // Deletes this object (called after a return to the message loop to allow
   // the stack in ViewHierarchyChanged to unwind).
   void DeleteSelf();
 
   // The optional icon at the left edge of the InfoBar.
   views::ImageView* icon_;
 
   // The close button at the right edge of the InfoBar.
   views::ImageButton* close_button_;
 
   // Tracks and stores the last focused view which is not the InfoBar or any of
   // its children. Used to restore focus once the InfoBar is closed.
   scoped_ptr<views::ExternalFocusTracker> focus_tracker_;
 
   // Used to delete this object after a return to the message loop.
   ScopedRunnableMethodFactory<InfoBarView> delete_factory_;
 
   // The target height for the bar portion of the InfoBarView.
   int target_height_;
 
+  // The current heights of the tab and bar portions.
+  int tab_height_;
+  int bar_height_;
+
+  // The paths for the InfoBarBackground to draw, sized according to the heights
+  // above.
   scoped_ptr<SkPath> fill_path_;
   scoped_ptr<SkPath> stroke_path_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_