| Index: components/infobars/core/infobar.h
|
| diff --git a/components/infobars/core/infobar.h b/components/infobars/core/infobar.h
|
| index fe32c3f41831341167ae38deb6c91fa20796cc93..ba6253f77f382ba973441025115d347cefca55d7 100644
|
| --- a/components/infobars/core/infobar.h
|
| +++ b/components/infobars/core/infobar.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef COMPONENTS_INFOBARS_CORE_INFOBAR_H_
|
| #define COMPONENTS_INFOBARS_CORE_INFOBAR_H_
|
|
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "components/infobars/core/infobar_delegate.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "ui/gfx/animation/animation_delegate.h"
|
| @@ -41,7 +41,7 @@ class InfoBar : public gfx::AnimationDelegate {
|
| typedef InfoBar AddedDetails;
|
| typedef std::pair<InfoBar*, bool> RemovedDetails;
|
|
|
| - explicit InfoBar(scoped_ptr<InfoBarDelegate> delegate);
|
| + explicit InfoBar(std::unique_ptr<InfoBarDelegate> delegate);
|
| ~InfoBar() override;
|
|
|
| static SkColor GetTopColor(InfoBarDelegate::Type infobar_type);
|
| @@ -121,7 +121,7 @@ class InfoBar : public gfx::AnimationDelegate {
|
| void MaybeDelete();
|
|
|
| InfoBarManager* owner_;
|
| - scoped_ptr<InfoBarDelegate> delegate_;
|
| + std::unique_ptr<InfoBarDelegate> delegate_;
|
| InfoBarContainer* container_;
|
| gfx::SlideAnimation animation_;
|
|
|
|
|