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

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

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.cc ('k') | chrome/browser/ui/views/infobars/infobar_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/infobars/infobar_container.h
===================================================================
--- chrome/browser/ui/views/infobars/infobar_container.h (revision 80169)
+++ chrome/browser/ui/views/infobars/infobar_container.h (working copy)
@@ -25,11 +25,10 @@
// functions, which are pure virtual here.
class InfoBarContainer : public NotificationObserver {
public:
- // The delegate is notified each time InfoBarContainer::OnInfoBarAnimated() is
- // called.
+ // The delegate is notified each time the infobar container changes height.
class Delegate {
public:
- virtual void InfoBarContainerSizeChanged(bool is_animating) = 0;
+ virtual void InfoBarContainerHeightChanged(bool is_animating) = 0;
protected:
virtual ~Delegate();
@@ -43,10 +42,10 @@
// |contents|, and show them all. |contents| may be NULL.
void ChangeTabContents(TabContents* contents);
- // Called when a contained infobar has animated. The container is expected to
- // do anything necessary to respond to the infobar's possible size change,
+ // Called when a contained infobar has animated or by some other means changed
+ // its height. The container is expected to do anything necessary to respond,
// e.g. re-layout.
- void OnInfoBarAnimated(bool done);
+ void OnInfoBarHeightChanged(bool is_animating);
// Remove the specified InfoBarDelegate from the selected TabContents. This
// will notify us back and cause us to close the InfoBar. This is called from
@@ -58,6 +57,10 @@
// hidden.
void RemoveInfoBar(InfoBar* infobar);
+ // Return the amount by which to overlap the toolbar above, so that the
+ // InfoBars inside may draw anti-spoof arrows atop it.
+ virtual int GetVerticalOverlap() = 0;
+
protected:
// These must be implemented on each platform to e.g. adjust the visible
// object hierarchy.
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar.cc ('k') | chrome/browser/ui/views/infobars/infobar_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698