| Index: components/infobars/core/simple_alert_infobar_delegate.cc
|
| diff --git a/components/infobars/core/simple_alert_infobar_delegate.cc b/components/infobars/core/simple_alert_infobar_delegate.cc
|
| index 7385fd6e617a30dcc5bf149cc8c10dd99a2b6192..ce84d8fbd97d2e07416a5f87b1304c2eb6b90dcf 100644
|
| --- a/components/infobars/core/simple_alert_infobar_delegate.cc
|
| +++ b/components/infobars/core/simple_alert_infobar_delegate.cc
|
| @@ -12,22 +12,24 @@
|
| void SimpleAlertInfoBarDelegate::Create(
|
| infobars::InfoBarManager* infobar_manager,
|
| int icon_id,
|
| + gfx::VectorIconId vector_icon_id,
|
| const base::string16& message,
|
| bool auto_expire) {
|
| - infobar_manager->AddInfoBar(
|
| - infobar_manager->CreateConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
|
| - new SimpleAlertInfoBarDelegate(icon_id, message, auto_expire))));
|
| + infobar_manager->AddInfoBar(infobar_manager->CreateConfirmInfoBar(
|
| + scoped_ptr<ConfirmInfoBarDelegate>(new SimpleAlertInfoBarDelegate(
|
| + icon_id, vector_icon_id, message, auto_expire))));
|
| }
|
|
|
| SimpleAlertInfoBarDelegate::SimpleAlertInfoBarDelegate(
|
| int icon_id,
|
| + gfx::VectorIconId vector_icon_id,
|
| const base::string16& message,
|
| bool auto_expire)
|
| : ConfirmInfoBarDelegate(),
|
| icon_id_(icon_id),
|
| + vector_icon_id_(vector_icon_id),
|
| message_(message),
|
| - auto_expire_(auto_expire) {
|
| -}
|
| + auto_expire_(auto_expire) {}
|
|
|
| SimpleAlertInfoBarDelegate::~SimpleAlertInfoBarDelegate() {
|
| }
|
| @@ -36,6 +38,10 @@ int SimpleAlertInfoBarDelegate::GetIconId() const {
|
| return icon_id_;
|
| }
|
|
|
| +gfx::VectorIconId SimpleAlertInfoBarDelegate::GetVectorIconId() const {
|
| + return vector_icon_id_;
|
| +}
|
| +
|
| bool SimpleAlertInfoBarDelegate::ShouldExpire(
|
| const NavigationDetails& details) const {
|
| return auto_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details);
|
|
|