| 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 "mojo/public/c/system/main.h" | |
| 7 #include "mojo/public/cpp/bindings/binding_set.h" | 6 #include "mojo/public/cpp/bindings/binding_set.h" |
| 7 #include "services/shell/public/c/main.h" |
| 8 #include "services/shell/public/cpp/service.h" | 8 #include "services/shell/public/cpp/service.h" |
| 9 #include "services/shell/public/cpp/service_runner.h" | 9 #include "services/shell/public/cpp/service_runner.h" |
| 10 #include "services/shell/tests/shutdown/shutdown_unittest.mojom.h" | 10 #include "services/shell/tests/shutdown/shutdown_unittest.mojom.h" |
| 11 | 11 |
| 12 namespace shell { | 12 namespace shell { |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 shell::ServiceRunner* g_app = nullptr; | 15 shell::ServiceRunner* g_app = nullptr; |
| 16 | 16 |
| 17 class ShutdownServiceApp | 17 class ShutdownServiceApp |
| (...skipping 23 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 mojo::BindingSet<mojom::ShutdownTestService> bindings_; | 42 mojo::BindingSet<mojom::ShutdownTestService> bindings_; |
| 43 | 43 |
| 44 DISALLOW_COPY_AND_ASSIGN(ShutdownServiceApp); | 44 DISALLOW_COPY_AND_ASSIGN(ShutdownServiceApp); |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 } // namespace | 47 } // namespace |
| 48 } // namespace shell | 48 } // namespace shell |
| 49 | 49 |
| 50 | 50 |
| 51 MojoResult MojoMain(MojoHandle shell_handle) { | 51 MojoResult ServiceMain(MojoHandle service_request_handle) { |
| 52 shell::ServiceRunner runner(new shell::ShutdownServiceApp); | 52 shell::ServiceRunner runner(new shell::ShutdownServiceApp); |
| 53 shell::g_app = &runner; | 53 shell::g_app = &runner; |
| 54 return runner.Run(shell_handle); | 54 return runner.Run(service_request_handle); |
| 55 } | 55 } |
| OLD | NEW |