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

Unified Diff: chrome/browser/ui/views/infobars/infobar.cc

Issue 6788014: Fix DCHECK() in infobar animation. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar.h ('k') | chrome/browser/ui/views/infobars/infobar_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/infobars/infobar.cc
===================================================================
--- chrome/browser/ui/views/infobars/infobar.cc (revision 80169)
+++ chrome/browser/ui/views/infobars/infobar.cc (working copy)
@@ -39,8 +39,7 @@
}
void InfoBar::AnimationProgressed(const ui::Animation* animation) {
- if (container_)
- container_->OnInfoBarAnimated(false);
+ RecalculateHeight();
}
void InfoBar::RemoveInfoBar() {
@@ -48,12 +47,14 @@
container_->RemoveDelegate(delegate_);
}
-void InfoBar::PlatformSpecificHide(bool animate) {
+void InfoBar::RecalculateHeight() {
+ PlatformSpecificRecalculateHeight();
+ if (container_)
+ container_->OnInfoBarHeightChanged(animation_->is_animating());
}
void InfoBar::AnimationEnded(const ui::Animation* animation) {
- if (container_)
- container_->OnInfoBarAnimated(true);
+ RecalculateHeight();
MaybeDelete();
}
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar.h ('k') | chrome/browser/ui/views/infobars/infobar_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698