| Index: content/shell/browser/shell_platform_data_aura.h
|
| diff --git a/content/shell/browser/shell_platform_data_aura.h b/content/shell/browser/shell_platform_data_aura.h
|
| index 23809578e6198a55079c5fc69c5458a5280cc0e0..be93d87279b16694e563845803b684042e056974 100644
|
| --- a/content/shell/browser/shell_platform_data_aura.h
|
| +++ b/content/shell/browser/shell_platform_data_aura.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_
|
| #define CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/aura/window_tree_host.h"
|
|
|
| namespace aura {
|
| @@ -38,10 +39,10 @@ class ShellPlatformDataAura {
|
| aura::WindowTreeHost* host() { return host_.get(); }
|
|
|
| private:
|
| - scoped_ptr<aura::WindowTreeHost> host_;
|
| - scoped_ptr<aura::client::FocusClient> focus_client_;
|
| - scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
|
| - scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
|
| + std::unique_ptr<aura::WindowTreeHost> host_;
|
| + std::unique_ptr<aura::client::FocusClient> focus_client_;
|
| + std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
|
| + std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellPlatformDataAura);
|
| };
|
|
|