| Index: chrome/browser/ui/views/certificate_selector.h
|
| diff --git a/chrome/browser/ui/views/certificate_selector.h b/chrome/browser/ui/views/certificate_selector.h
|
| index 3e14e5b16f361c8e9d2d8fa153bad9b6e4b8762d..1c01233828a02be285e8fe9cfb5d4e0c80d93889 100644
|
| --- a/chrome/browser/ui/views/certificate_selector.h
|
| +++ b/chrome/browser/ui/views/certificate_selector.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CHROME_BROWSER_UI_VIEWS_CERTIFICATE_SELECTOR_H_
|
| #define CHROME_BROWSER_UI_VIEWS_CERTIFICATE_SELECTOR_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "net/cert/x509_certificate.h"
|
| #include "ui/views/controls/button/button.h"
|
| @@ -76,7 +77,7 @@ class CertificateSelector : public views::DialogDelegateView,
|
| // Initializes the dialog. |text| is shown above the list of certificates
|
| // and is supposed to explain to the user what the implication of the
|
| // certificate selection is.
|
| - void InitWithText(scoped_ptr<views::View> text_label);
|
| + void InitWithText(std::unique_ptr<views::View> text_label);
|
|
|
| private:
|
| class CertificateTableModel;
|
| @@ -88,7 +89,7 @@ class CertificateSelector : public views::DialogDelegateView,
|
| // shown only if there is at least one non-empty provider, i.e. non-platform
|
| // certificate.
|
| bool show_provider_column_ = false;
|
| - scoped_ptr<CertificateTableModel> model_;
|
| + std::unique_ptr<CertificateTableModel> model_;
|
|
|
| content::WebContents* const web_contents_;
|
|
|
|
|