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

Unified Diff: chrome/browser/ui/views/infobars/infobar_container.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
Index: chrome/browser/ui/views/infobars/infobar_container.cc
===================================================================
--- chrome/browser/ui/views/infobars/infobar_container.cc (revision 80169)
+++ chrome/browser/ui/views/infobars/infobar_container.cc (working copy)
@@ -20,9 +20,10 @@
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);
}
@@ -60,12 +61,12 @@
}
// 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) {
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar_container.h ('k') | chrome/browser/ui/views/infobars/infobar_container_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698