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

Unified Diff: chrome/browser/ui/views/infobars/extension_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/frame/browser_view_layout.cc ('k') | chrome/browser/ui/views/infobars/infobar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/infobars/extension_infobar.cc
===================================================================
--- chrome/browser/ui/views/infobars/extension_infobar.cc (revision 80169)
+++ chrome/browser/ui/views/infobars/extension_infobar.cc (working copy)
@@ -43,7 +43,7 @@
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 @@
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/ui/views/frame/browser_view_layout.cc ('k') | chrome/browser/ui/views/infobars/infobar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698