From f452e1aa97fbcd7e3d5560fc456819bf40e5c57c Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Tue, 24 May 2011 18:02:24 +0000 Subject: Misc. infobar stuff: * Move the cross-platform parts of InfoBar and InfoBarContainer to chrome/browser/tab_contents (but place them under a TOOLKIT_VIEWS #ifdef until other platforms are ported). * Plumb the "owning" TabContentsWrapper* through the infobar creation APIs. Ultimately the InfoBar will use this (when TabContents actually starts owning InfoBar*s), but for now it just stores it as an unused member. * A few random other small changes. BUG=62154 TEST=none Review URL: http://codereview.chromium.org/6989001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86450 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/tab_contents/confirm_infobar_delegate.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'chrome/browser/tab_contents/confirm_infobar_delegate.h') diff --git a/chrome/browser/tab_contents/confirm_infobar_delegate.h b/chrome/browser/tab_contents/confirm_infobar_delegate.h index 07a9f3d..694ff28 100644 --- a/chrome/browser/tab_contents/confirm_infobar_delegate.h +++ b/chrome/browser/tab_contents/confirm_infobar_delegate.h @@ -35,11 +35,12 @@ class ConfirmInfoBarDelegate : public InfoBarDelegate { virtual bool NeedElevation(InfoBarButton button) const; // Called when the OK button is pressed. If the function returns true, the - // InfoBarDelegate should be removed from the associated TabContents. + // InfoBarDelegate should be removed from the associated TabContentsWrapper. virtual bool Accept(); // Called when the Cancel button is pressed. If the function returns true, - // the InfoBarDelegate should be removed from the associated TabContents. + // the InfoBarDelegate should be removed from the associated + // TabContentsWrapper. virtual bool Cancel(); // Returns the text of the link to be displayed, if any. Otherwise returns @@ -60,7 +61,7 @@ class ConfirmInfoBarDelegate : public InfoBarDelegate { private: // InfoBarDelegate: - virtual InfoBar* CreateInfoBar() OVERRIDE; + virtual InfoBar* CreateInfoBar(TabContentsWrapper* owner) OVERRIDE; virtual bool EqualsDelegate(InfoBarDelegate* delegate) const OVERRIDE; virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate() OVERRIDE; -- cgit v1.1