| Index: components/pdf/browser/pdf_web_contents_helper.h
|
| diff --git a/components/pdf/browser/pdf_web_contents_helper.h b/components/pdf/browser/pdf_web_contents_helper.h
|
| index 1213a8dfa13b417db53de802bffad9e840101dd0..c8b7a7820dad12e8820c1f05706130700939a4d9 100644
|
| --- a/components/pdf/browser/pdf_web_contents_helper.h
|
| +++ b/components/pdf/browser/pdf_web_contents_helper.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef COMPONENTS_PDF_BROWSER_PDF_WEB_CONTENTS_HELPER_H_
|
| #define COMPONENTS_PDF_BROWSER_PDF_WEB_CONTENTS_HELPER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/browser/web_contents_user_data.h"
|
| #include "ipc/ipc_message.h"
|
| @@ -30,17 +30,18 @@ class PDFWebContentsHelper
|
| public:
|
| static void CreateForWebContentsWithClient(
|
| content::WebContents* contents,
|
| - scoped_ptr<PDFWebContentsHelperClient> client);
|
| + std::unique_ptr<PDFWebContentsHelperClient> client);
|
|
|
| OpenPDFInReaderPromptClient* open_in_reader_prompt() const {
|
| return open_in_reader_prompt_.get();
|
| }
|
|
|
| - void ShowOpenInReaderPrompt(scoped_ptr<OpenPDFInReaderPromptClient> prompt);
|
| + void ShowOpenInReaderPrompt(
|
| + std::unique_ptr<OpenPDFInReaderPromptClient> prompt);
|
|
|
| private:
|
| PDFWebContentsHelper(content::WebContents* web_contents,
|
| - scoped_ptr<PDFWebContentsHelperClient> client);
|
| + std::unique_ptr<PDFWebContentsHelperClient> client);
|
| ~PDFWebContentsHelper() override;
|
|
|
| // content::WebContentsObserver overrides:
|
| @@ -59,8 +60,8 @@ class PDFWebContentsHelper
|
| void OnUpdateContentRestrictions(int content_restrictions);
|
|
|
| // The model for the confirmation prompt to open a PDF in Adobe Reader.
|
| - scoped_ptr<OpenPDFInReaderPromptClient> open_in_reader_prompt_;
|
| - scoped_ptr<PDFWebContentsHelperClient> client_;
|
| + std::unique_ptr<OpenPDFInReaderPromptClient> open_in_reader_prompt_;
|
| + std::unique_ptr<PDFWebContentsHelperClient> client_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PDFWebContentsHelper);
|
| };
|
|
|