| 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/service.h" | 8 #include "services/shell/public/cpp/service.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::ApplicationRunner* g_app = nullptr; | 15 shell::ServiceRunner* g_app = nullptr; |
| 16 | 16 |
| 17 class ShutdownServiceApp | 17 class ShutdownServiceApp |
| 18 : public Service, | 18 : public Service, |
| 19 public InterfaceFactory<mojom::ShutdownTestService>, | 19 public InterfaceFactory<mojom::ShutdownTestService>, |
| 20 public mojom::ShutdownTestService { | 20 public mojom::ShutdownTestService { |
| 21 public: | 21 public: |
| 22 ShutdownServiceApp() {} | 22 ShutdownServiceApp() {} |
| 23 ~ShutdownServiceApp() override {} | 23 ~ShutdownServiceApp() override {} |
| 24 | 24 |
| 25 private: | 25 private: |
| (...skipping 18 matching lines...) Expand all Loading... |
| 44 mojo::BindingSet<mojom::ShutdownTestService> bindings_; | 44 mojo::BindingSet<mojom::ShutdownTestService> bindings_; |
| 45 | 45 |
| 46 DISALLOW_COPY_AND_ASSIGN(ShutdownServiceApp); | 46 DISALLOW_COPY_AND_ASSIGN(ShutdownServiceApp); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 } // namespace | 49 } // namespace |
| 50 } // namespace shell | 50 } // namespace shell |
| 51 | 51 |
| 52 | 52 |
| 53 MojoResult MojoMain(MojoHandle shell_handle) { | 53 MojoResult MojoMain(MojoHandle shell_handle) { |
| 54 shell::ApplicationRunner runner(new shell::ShutdownServiceApp); | 54 shell::ServiceRunner runner(new shell::ShutdownServiceApp); |
| 55 shell::g_app = &runner; | 55 shell::g_app = &runner; |
| 56 return runner.Run(shell_handle); | 56 return runner.Run(shell_handle); |
| 57 } | 57 } |
| OLD | NEW |