| 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/macros.h" | 5 #include "base/macros.h" |
| 6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
| 7 #include "mojo/public/c/system/main.h" | |
| 8 #include "mojo/public/cpp/bindings/binding_set.h" | 7 #include "mojo/public/cpp/bindings/binding_set.h" |
| 8 #include "services/shell/public/c/main.h" |
| 9 #include "services/shell/public/cpp/connector.h" | 9 #include "services/shell/public/cpp/connector.h" |
| 10 #include "services/shell/public/cpp/interface_factory.h" | 10 #include "services/shell/public/cpp/interface_factory.h" |
| 11 #include "services/shell/public/cpp/service.h" | 11 #include "services/shell/public/cpp/service.h" |
| 12 #include "services/shell/public/cpp/service_runner.h" | 12 #include "services/shell/public/cpp/service_runner.h" |
| 13 #include "services/shell/tests/shutdown/shutdown_unittest.mojom.h" | 13 #include "services/shell/tests/shutdown/shutdown_unittest.mojom.h" |
| 14 | 14 |
| 15 namespace shell { | 15 namespace shell { |
| 16 | 16 |
| 17 class ShutdownClientApp | 17 class ShutdownClientApp |
| 18 : public Service, | 18 : public Service, |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 } | 59 } |
| 60 | 60 |
| 61 mojo::BindingSet<mojom::ShutdownTestClientController> bindings_; | 61 mojo::BindingSet<mojom::ShutdownTestClientController> bindings_; |
| 62 | 62 |
| 63 DISALLOW_COPY_AND_ASSIGN(ShutdownClientApp); | 63 DISALLOW_COPY_AND_ASSIGN(ShutdownClientApp); |
| 64 }; | 64 }; |
| 65 | 65 |
| 66 } // namespace shell | 66 } // namespace shell |
| 67 | 67 |
| 68 | 68 |
| 69 MojoResult MojoMain(MojoHandle shell_handle) { | 69 MojoResult ServiceMain(MojoHandle service_request_handle) { |
| 70 return shell::ServiceRunner(new shell::ShutdownClientApp) | 70 shell::ServiceRunner runner(new shell::ShutdownClientApp); |
| 71 .Run(shell_handle); | 71 return runner.Run(service_request_handle); |
| 72 } | 72 } |
| OLD | NEW |