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_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_ | 5 #ifndef MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_ |
6 #define MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_ | 6 #define MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_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/shell/public/cpp/shell_client.h" | 11 #include "mojo/shell/public/cpp/shell_client.h" |
11 | 12 |
12 namespace views { | 13 namespace views { |
13 class AuraInit; | 14 class AuraInit; |
14 } | 15 } |
15 | 16 |
16 class WindowTypeLauncher : public mojo::ShellClient { | 17 class WindowTypeLauncher : public mojo::ShellClient { |
17 public: | 18 public: |
18 WindowTypeLauncher(); | 19 WindowTypeLauncher(); |
19 ~WindowTypeLauncher() override; | 20 ~WindowTypeLauncher() override; |
20 | 21 |
21 private: | 22 private: |
22 // mojo::ShellClient: | 23 // mojo::ShellClient: |
23 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, | 24 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, |
24 uint32_t id) override; | 25 uint32_t id) override; |
25 bool ShellConnectionLost() override; | 26 bool ShellConnectionLost() override; |
26 | 27 |
27 scoped_ptr<views::AuraInit> aura_init_; | 28 std::unique_ptr<views::AuraInit> aura_init_; |
28 | 29 |
29 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher); | 30 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher); |
30 }; | 31 }; |
31 | 32 |
32 #endif // MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_ | 33 #endif // MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_ |
OLD | NEW |