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