| Index: mash/example/views_examples/views_examples_application_delegate.h
|
| diff --git a/mash/example/views_examples/views_examples_application_delegate.h b/mash/example/views_examples/views_examples_application_delegate.h
|
| index 3b4fb1124180552bf444cfe3abd0306898e2324a..75523102fc7147eb95268cc9114d0e5abfa97602 100644
|
| --- a/mash/example/views_examples/views_examples_application_delegate.h
|
| +++ b/mash/example/views_examples/views_examples_application_delegate.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
|
| #define MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_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"
|
|
|
| @@ -27,7 +28,7 @@ class ViewsExamplesApplicationDelegate : public mojo::ShellClient {
|
|
|
| mojo::TracingImpl tracing_;
|
|
|
| - scoped_ptr<views::AuraInit> aura_init_;
|
| + std::unique_ptr<views::AuraInit> aura_init_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ViewsExamplesApplicationDelegate);
|
| };
|
|
|