| Index: ash/shell/content/client/shell_main_delegate.h
|
| diff --git a/ash/shell/content/client/shell_main_delegate.h b/ash/shell/content/client/shell_main_delegate.h
|
| index 98bc44d120d6e7b6203734af5eb14b4336930d3a..a7bd2c98a81b9c644a3d0c9b85c947e4a9aec4a2 100644
|
| --- a/ash/shell/content/client/shell_main_delegate.h
|
| +++ b/ash/shell/content/client/shell_main_delegate.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
|
| #define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/public/app/content_main_delegate.h"
|
| #include "content/shell/common/shell_content_client.h"
|
|
|
| @@ -33,7 +34,7 @@ class ShellMainDelegate : public content::ContentMainDelegate {
|
| private:
|
| void InitializeResourceBundle();
|
|
|
| - scoped_ptr<ShellContentBrowserClient> browser_client_;
|
| + std::unique_ptr<ShellContentBrowserClient> browser_client_;
|
| content::ShellContentClient content_client_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
|
|
|