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 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "mojo/shell/application_manager_apptests.mojom.h" | 8 #include "mojo/shell/application_manager_apptests.mojom.h" |
9 #include "mojo/shell/public/cpp/application_connection.h" | 9 #include "mojo/shell/public/cpp/connection.h" |
10 #include "mojo/shell/public/cpp/application_delegate.h" | |
11 #include "mojo/shell/public/cpp/shell.h" | 10 #include "mojo/shell/public/cpp/shell.h" |
| 11 #include "mojo/shell/public/cpp/shell_client.h" |
12 #include "mojo/shell/runner/child/test_native_main.h" | 12 #include "mojo/shell/runner/child/test_native_main.h" |
13 #include "mojo/shell/runner/init.h" | 13 #include "mojo/shell/runner/init.h" |
14 | 14 |
15 using mojo::shell::test::mojom::CreateInstanceForHandleTestPtr; | 15 using mojo::shell::test::mojom::CreateInstanceForHandleTestPtr; |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 class TargetApplicationDelegate : public mojo::ApplicationDelegate { | 19 class TargetApplicationDelegate : public mojo::ShellClient { |
20 public: | 20 public: |
21 TargetApplicationDelegate() {} | 21 TargetApplicationDelegate() {} |
22 ~TargetApplicationDelegate() override {} | 22 ~TargetApplicationDelegate() override {} |
23 | 23 |
24 private: | 24 private: |
25 // mojo::ApplicationDelegate: | 25 // mojo::ShellClient: |
26 void Initialize(mojo::Shell* shell, const std::string& url, | 26 void Initialize(mojo::Shell* shell, const std::string& url, |
27 uint32_t id) override { | 27 uint32_t id) override { |
28 CreateInstanceForHandleTestPtr service; | 28 CreateInstanceForHandleTestPtr service; |
29 shell->ConnectToService("mojo:mojo_shell_apptests", &service); | 29 shell->ConnectToService("mojo:mojo_shell_apptests", &service); |
30 service->SetTargetID(id); | 30 service->SetTargetID(id); |
31 } | 31 } |
32 | 32 |
33 DISALLOW_COPY_AND_ASSIGN(TargetApplicationDelegate); | 33 DISALLOW_COPY_AND_ASSIGN(TargetApplicationDelegate); |
34 }; | 34 }; |
35 | 35 |
36 } // namespace | 36 } // namespace |
37 | 37 |
38 int main(int argc, char** argv) { | 38 int main(int argc, char** argv) { |
39 base::AtExitManager at_exit; | 39 base::AtExitManager at_exit; |
40 base::CommandLine::Init(argc, argv); | 40 base::CommandLine::Init(argc, argv); |
41 | 41 |
42 mojo::shell::InitializeLogging(); | 42 mojo::shell::InitializeLogging(); |
43 | 43 |
44 TargetApplicationDelegate delegate; | 44 TargetApplicationDelegate delegate; |
45 return mojo::shell::TestNativeMain(&delegate); | 45 return mojo::shell::TestNativeMain(&delegate); |
46 } | 46 } |
OLD | NEW |