OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_ | 5 #ifndef MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_ |
6 #define MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_ | 6 #define MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 11 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
11 #include "mojo/shell/public/cpp/shell_client.h" | 12 #include "mojo/shell/public/cpp/shell_client.h" |
12 | 13 |
13 namespace views { | 14 namespace views { |
14 class AuraInit; | 15 class AuraInit; |
15 } | 16 } |
16 | 17 |
17 class ViewsExamplesApplicationDelegate : public mojo::ShellClient { | 18 class ViewsExamplesApplicationDelegate : public mojo::ShellClient { |
18 public: | 19 public: |
19 ViewsExamplesApplicationDelegate(); | 20 ViewsExamplesApplicationDelegate(); |
20 ~ViewsExamplesApplicationDelegate() override; | 21 ~ViewsExamplesApplicationDelegate() override; |
21 | 22 |
22 private: | 23 private: |
23 // mojo::ShellClient: | 24 // mojo::ShellClient: |
24 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, | 25 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, |
25 uint32_t id) override; | 26 uint32_t id) override; |
26 bool AcceptConnection(mojo::Connection* connection) override; | 27 bool AcceptConnection(mojo::Connection* connection) override; |
27 | 28 |
28 mojo::TracingImpl tracing_; | 29 mojo::TracingImpl tracing_; |
29 | 30 |
30 scoped_ptr<views::AuraInit> aura_init_; | 31 std::unique_ptr<views::AuraInit> aura_init_; |
31 | 32 |
32 DISALLOW_COPY_AND_ASSIGN(ViewsExamplesApplicationDelegate); | 33 DISALLOW_COPY_AND_ASSIGN(ViewsExamplesApplicationDelegate); |
33 }; | 34 }; |
34 | 35 |
35 #endif // MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_ | 36 #endif // MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_ |
OLD | NEW |