| Index: chrome/browser/ui/views/infobars/confirm_infobar.cc
|
| diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.cc b/chrome/browser/ui/views/infobars/confirm_infobar.cc
|
| index 415afcdff05ca5d212abb221c0cbd26e6d21502f..b2ba67696cc50dd639692db28698c154ea1be52c 100644
|
| --- a/chrome/browser/ui/views/infobars/confirm_infobar.cc
|
| +++ b/chrome/browser/ui/views/infobars/confirm_infobar.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/ui/views/infobars/confirm_infobar.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/logging.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| #include "chrome/browser/ui/views/elevation_icon_setter.h"
|
| @@ -18,19 +20,18 @@
|
|
|
| scoped_ptr<infobars::InfoBar> InfoBarService::CreateConfirmInfoBar(
|
| scoped_ptr<ConfirmInfoBarDelegate> delegate) {
|
| - return make_scoped_ptr(new ConfirmInfoBar(delegate.Pass()));
|
| + return make_scoped_ptr(new ConfirmInfoBar(std::move(delegate)));
|
| }
|
|
|
|
|
| // ConfirmInfoBar -------------------------------------------------------------
|
|
|
| ConfirmInfoBar::ConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate> delegate)
|
| - : InfoBarView(delegate.Pass()),
|
| + : InfoBarView(std::move(delegate)),
|
| label_(NULL),
|
| ok_button_(NULL),
|
| cancel_button_(NULL),
|
| - link_(NULL) {
|
| -}
|
| + link_(NULL) {}
|
|
|
| ConfirmInfoBar::~ConfirmInfoBar() {
|
| // Ensure |elevation_icon_setter_| is destroyed before |ok_button_|.
|
|
|