Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5415)

Unified Diff: chrome/browser/ui/views/infobars/infobar_view.h

Issue 6675033: Fix DCHECK in infobar animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added InvalidateLayout calls to animation and target_height changes. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/infobars/infobar_view.h
diff --git a/chrome/browser/ui/views/infobars/infobar_view.h b/chrome/browser/ui/views/infobars/infobar_view.h
index 3fcda116bab5973fc79029460e01fe07e0dbdd8c..3f46a3872ec03e2e00cf0f8058752d9b78b157f6 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.h
+++ b/chrome/browser/ui/views/infobars/infobar_view.h
@@ -122,7 +122,7 @@ class InfoBarView : public InfoBar,
// (Will lead to this InfoBar being closed).
void RemoveInfoBar() const;
- void set_target_height(int height) { target_height_ = height; }
+ void SetTargetHeight(int height);
ui::SlideAnimation* animation() { return animation_.get(); }
@@ -203,6 +203,12 @@ class InfoBarView : public InfoBar,
// The target height for the bar portion of the InfoBarView.
int target_height_;
+ // The current height for the tab portion of the InfoBarView.
+ int tab_height_;
+
+ // The current height for the bar portion of the InfoBarView.
+ int bar_height_;
+
scoped_ptr<SkPath> fill_path_;
scoped_ptr<SkPath> stroke_path_;
« no previous file with comments | « chrome/browser/ui/views/infobars/extension_infobar.cc ('k') | chrome/browser/ui/views/infobars/infobar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698