| Index: chrome/browser/ui/gtk/infobars/alternate_nav_infobar_gtk.cc
|
| ===================================================================
|
| --- chrome/browser/ui/gtk/infobars/alternate_nav_infobar_gtk.cc (revision 238220)
|
| +++ chrome/browser/ui/gtk/infobars/alternate_nav_infobar_gtk.cc (working copy)
|
| @@ -10,8 +10,10 @@
|
|
|
| // AlternateNavInfoBarDelegate -------------------------------------------------
|
|
|
| -InfoBar* AlternateNavInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
|
| - return new AlternateNavInfoBarGtk(owner, this);
|
| +// static
|
| +scoped_ptr<InfoBar> AlternateNavInfoBarDelegate::CreateInfoBar(
|
| + scoped_ptr<AlternateNavInfoBarDelegate> delegate) {
|
| + return scoped_ptr<InfoBar>(new AlternateNavInfoBarGtk(delegate.Pass()));
|
| }
|
|
|
|
|
| @@ -18,16 +20,15 @@
|
| // AlternateNavInfoBarGtk ------------------------------------------------------
|
|
|
| AlternateNavInfoBarGtk::AlternateNavInfoBarGtk(
|
| - InfoBarService* owner,
|
| - AlternateNavInfoBarDelegate* delegate)
|
| - : InfoBarGtk(owner, delegate) {
|
| + scoped_ptr<AlternateNavInfoBarDelegate> delegate)
|
| + : InfoBarGtk(delegate.PassAs<InfoBarDelegate>()) {
|
| }
|
|
|
| AlternateNavInfoBarGtk::~AlternateNavInfoBarGtk() {
|
| }
|
|
|
| -void AlternateNavInfoBarGtk::InitWidgets() {
|
| - InfoBarGtk::InitWidgets();
|
| +void AlternateNavInfoBarGtk::PlatformSpecificSetOwner() {
|
| + InfoBarGtk::PlatformSpecificSetOwner();
|
|
|
| size_t link_offset;
|
| string16 display_text = GetDelegate()->GetMessageTextWithOffset(&link_offset);
|
|
|