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 CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ | 5 #ifndef CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ |
6 #define CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ | 6 #define CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "content/public/common/mojo_shell_connection.h" | 12 #include "content/public/common/mojo_shell_connection.h" |
13 #include "mojo/application/public/cpp/application_delegate.h" | |
14 #include "mojo/public/cpp/system/message_pipe.h" | 13 #include "mojo/public/cpp/system/message_pipe.h" |
| 14 #include "mojo/shell/public/cpp/application_delegate.h" |
15 | 15 |
16 namespace mojo { | 16 namespace mojo { |
17 namespace runner { | 17 namespace runner { |
18 class RunnerConnection; | 18 class RunnerConnection; |
19 } | 19 } |
20 } | 20 } |
21 | 21 |
22 namespace content { | 22 namespace content { |
23 | 23 |
24 // Returns true for processes launched from an external mojo shell. | 24 // Returns true for processes launched from an external mojo shell. |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 scoped_ptr<mojo::runner::RunnerConnection> runner_connection_; | 68 scoped_ptr<mojo::runner::RunnerConnection> runner_connection_; |
69 scoped_ptr<mojo::ApplicationImpl> application_impl_; | 69 scoped_ptr<mojo::ApplicationImpl> application_impl_; |
70 std::vector<Listener*> listeners_; | 70 std::vector<Listener*> listeners_; |
71 | 71 |
72 DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl); | 72 DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl); |
73 }; | 73 }; |
74 | 74 |
75 } // namespace content | 75 } // namespace content |
76 | 76 |
77 #endif // CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ | 77 #endif // CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_ |
OLD | NEW |