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

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

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/extension_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index 4b5a4ff79179bb826bb7e59d8884a3c326f3ddf0..e1234590f344cf6711ace58971571ee21ef1606d 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -43,7 +43,7 @@ ExtensionInfoBar::ExtensionInfoBar(ExtensionInfoBarDelegate* delegate)
ExtensionView* extension_view = delegate->extension_host()->view();
int height = extension_view->GetPreferredSize().height();
- set_target_height((height > 0) ?
+ SetTargetHeight((height > 0) ?
(height + InfoBarBackground::kSeparatorLineHeight) : height);
// Get notified of resize events for the ExtensionView.
@@ -130,7 +130,7 @@ void ExtensionInfoBar::OnExtensionPreferredSizeChanged(ExtensionView* view) {
animation()->Reset(0.0);
// Clamp height to a min and a max size of between 1 and 2 InfoBars.
- set_target_height(std::min(2 * kDefaultTargetHeight,
+ SetTargetHeight(std::min(2 * kDefaultTargetHeight,
std::max(kDefaultTargetHeight, view->GetPreferredSize().height())));
animation()->Show();
« no previous file with comments | « chrome/browser/extensions/extension_infobar_apitest.cc ('k') | chrome/browser/ui/views/infobars/infobar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698