Index: chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc |
diff --git a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc |
index ad9a0aecf4e60611fb83647f93f11bfa7ee6d4f6..764ead46132cdc0601b20e7e02f04e761a9607cf 100644 |
--- a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc |
+++ b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc |
@@ -5,9 +5,11 @@ |
#include "chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h" |
#include <stddef.h> |
+ |
#include <utility> |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h" |
#include "ui/base/window_open_disposition.h" |
#include "ui/gfx/text_elider.h" |
@@ -18,16 +20,16 @@ |
// AlternateNavInfoBarDelegate ------------------------------------------------- |
// static |
-scoped_ptr<infobars::InfoBar> AlternateNavInfoBarDelegate::CreateInfoBar( |
- scoped_ptr<AlternateNavInfoBarDelegate> delegate) { |
- return make_scoped_ptr(new AlternateNavInfoBarView(std::move(delegate))); |
+std::unique_ptr<infobars::InfoBar> AlternateNavInfoBarDelegate::CreateInfoBar( |
+ std::unique_ptr<AlternateNavInfoBarDelegate> delegate) { |
+ return base::WrapUnique(new AlternateNavInfoBarView(std::move(delegate))); |
} |
// AlternateNavInfoBarView ----------------------------------------------------- |
AlternateNavInfoBarView::AlternateNavInfoBarView( |
- scoped_ptr<AlternateNavInfoBarDelegate> delegate) |
+ std::unique_ptr<AlternateNavInfoBarDelegate> delegate) |
: InfoBarView(std::move(delegate)), |
label_1_(NULL), |
link_(NULL), |