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

Unified Diff: chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h

Issue 6926001: Replace the virtual InfoBarDelegate::InfoBarClosed() function with a non-virtual one. This is a ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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/cocoa/infobars/mock_confirm_infobar_delegate.h
===================================================================
--- chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h (revision 84141)
+++ chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h (working copy)
@@ -15,7 +15,16 @@
class MockConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
public:
- MockConfirmInfoBarDelegate();
+ // Called when |this| is about to be destroyed.
+ class Owner {
+ public:
+ virtual void OnInfoBarDelegateClosed() = 0;
+
+ protected:
+ virtual ~Owner() {}
+ };
+
+ explicit MockConfirmInfoBarDelegate(Owner* owner);
virtual ~MockConfirmInfoBarDelegate();
void set_dont_close_on_action() { closes_on_action_ = false; }
@@ -25,13 +34,11 @@
bool ok_clicked() const { return ok_clicked_; }
bool cancel_clicked() const { return cancel_clicked_; }
bool link_clicked() const { return link_clicked_; }
- bool closed() const { return closed_; }
static const char kMessage[];
private:
// ConfirmInfoBarDelegate:
- virtual void InfoBarClosed() OVERRIDE;
virtual gfx::Image* GetIcon() const OVERRIDE;
virtual string16 GetMessageText() const OVERRIDE;
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
@@ -40,6 +47,7 @@
virtual string16 GetLinkText() OVERRIDE;
virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+ Owner* owner_;
// Determines whether the infobar closes when an action is taken or not.
bool closes_on_action_;
mutable bool icon_accessed_;
@@ -48,7 +56,6 @@
bool ok_clicked_;
bool cancel_clicked_;
bool link_clicked_;
- bool closed_;
DISALLOW_COPY_AND_ASSIGN(MockConfirmInfoBarDelegate);
};

Powered by Google App Engine
This is Rietveld 408576698