| Index: content/shell/browser/shell_javascript_dialog_manager.h
|
| diff --git a/content/shell/browser/shell_javascript_dialog_manager.h b/content/shell/browser/shell_javascript_dialog_manager.h
|
| index fbeefbb4963d446029e94e83badb54d740fb9df7..dd2bc6737b0e64373cb1664672a4643f0ef14926 100644
|
| --- a/content/shell/browser/shell_javascript_dialog_manager.h
|
| +++ b/content/shell/browser/shell_javascript_dialog_manager.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
|
| #define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback_forward.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "content/public/browser/javascript_dialog_manager.h"
|
|
|
| @@ -52,7 +53,7 @@ class ShellJavaScriptDialogManager : public JavaScriptDialogManager {
|
| private:
|
| #if defined(OS_MACOSX) || defined(OS_WIN)
|
| // The dialog being shown. No queueing.
|
| - scoped_ptr<ShellJavaScriptDialog> dialog_;
|
| + std::unique_ptr<ShellJavaScriptDialog> dialog_;
|
| #else
|
| // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
|
| #endif
|
|
|