| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/bindings/binding_set.h" | 10 #include "mojo/public/cpp/bindings/binding_set.h" |
| 11 #include "services/shell/public/cpp/application_runner.h" | |
| 12 #include "services/shell/public/cpp/connector.h" | 11 #include "services/shell/public/cpp/connector.h" |
| 13 #include "services/shell/public/cpp/interface_factory.h" | 12 #include "services/shell/public/cpp/interface_factory.h" |
| 14 #include "services/shell/public/cpp/service.h" | 13 #include "services/shell/public/cpp/service.h" |
| 14 #include "services/shell/public/cpp/service_runner.h" |
| 15 #include "services/shell/public/interfaces/connector.mojom.h" | 15 #include "services/shell/public/interfaces/connector.mojom.h" |
| 16 #include "services/shell/tests/connect/connect_test.mojom.h" | 16 #include "services/shell/tests/connect/connect_test.mojom.h" |
| 17 | 17 |
| 18 namespace shell { | 18 namespace shell { |
| 19 | 19 |
| 20 using GetTitleCallback = test::mojom::ConnectTestService::GetTitleCallback; | 20 using GetTitleCallback = test::mojom::ConnectTestService::GetTitleCallback; |
| 21 | 21 |
| 22 class ConnectTestClassApp | 22 class ConnectTestClassApp |
| 23 : public Service, | 23 : public Service, |
| 24 public InterfaceFactory<test::mojom::ConnectTestService>, | 24 public InterfaceFactory<test::mojom::ConnectTestService>, |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 mojo::BindingSet<test::mojom::ConnectTestService> bindings_; | 85 mojo::BindingSet<test::mojom::ConnectTestService> bindings_; |
| 86 mojo::BindingSet<test::mojom::ClassInterface> class_interface_bindings_; | 86 mojo::BindingSet<test::mojom::ClassInterface> class_interface_bindings_; |
| 87 | 87 |
| 88 DISALLOW_COPY_AND_ASSIGN(ConnectTestClassApp); | 88 DISALLOW_COPY_AND_ASSIGN(ConnectTestClassApp); |
| 89 }; | 89 }; |
| 90 | 90 |
| 91 } // namespace shell | 91 } // namespace shell |
| 92 | 92 |
| 93 | 93 |
| 94 MojoResult MojoMain(MojoHandle shell_handle) { | 94 MojoResult MojoMain(MojoHandle shell_handle) { |
| 95 MojoResult rv = shell::ApplicationRunner(new shell::ConnectTestClassApp) | 95 MojoResult rv = shell::ServiceRunner(new shell::ConnectTestClassApp) |
| 96 .Run(shell_handle); | 96 .Run(shell_handle); |
| 97 return rv; | 97 return rv; |
| 98 } | 98 } |
| OLD | NEW |