| Index: ash/mus/sysui_application.h
|
| diff --git a/ash/mus/sysui_application.h b/ash/mus/sysui_application.h
|
| index dba0f5e3dc28d611a985b4767c302f017fa3b96b..552f21080ed96052c94526d67c8ad968c72a8075 100644
|
| --- a/ash/mus/sysui_application.h
|
| +++ b/ash/mus/sysui_application.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef ASH_MUS_SYSUI_APPLICATION_H_
|
| #define ASH_MUS_SYSUI_APPLICATION_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "mojo/services/tracing/public/cpp/tracing_impl.h"
|
| #include "mojo/shell/public/cpp/shell_client.h"
|
|
|
| @@ -28,7 +29,7 @@ class SysUIApplication : public mojo::ShellClient {
|
| bool AcceptConnection(mojo::Connection* connection) override;
|
|
|
| mojo::TracingImpl tracing_;
|
| - scoped_ptr<AshInit> ash_init_;
|
| + std::unique_ptr<AshInit> ash_init_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SysUIApplication);
|
| };
|
|
|