| 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 #ifndef MOJO_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_ | 5 #ifndef SERVICES_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_ |
| 6 #define MOJO_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_ | 6 #define SERVICES_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_ |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "mojo/public/cpp/bindings/binding_set.h" | 10 #include "mojo/public/cpp/bindings/binding_set.h" |
| 11 #include "mojo/shell/public/cpp/application_runner.h" | 11 #include "services/shell/public/cpp/application_runner.h" |
| 12 #include "mojo/shell/public/cpp/interface_factory.h" | 12 #include "services/shell/public/cpp/interface_factory.h" |
| 13 #include "mojo/shell/public/cpp/shell_client.h" | 13 #include "services/shell/public/cpp/shell_client.h" |
| 14 #include "mojo/shell/public/interfaces/shell_client.mojom.h" | 14 #include "services/shell/public/interfaces/shell_client.mojom.h" |
| 15 #include "mojo/shell/tests/lifecycle/lifecycle_unittest.mojom.h" | 15 #include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h" |
| 16 | 16 |
| 17 using LifecycleControl = mojo::shell::test::mojom::LifecycleControl; | 17 using LifecycleControl = mojo::shell::test::mojom::LifecycleControl; |
| 18 using LifecycleControlRequest = | 18 using LifecycleControlRequest = |
| 19 mojo::shell::test::mojom::LifecycleControlRequest; | 19 mojo::shell::test::mojom::LifecycleControlRequest; |
| 20 | 20 |
| 21 namespace mojo { | 21 namespace mojo { |
| 22 class ShellConnection; | 22 class ShellConnection; |
| 23 namespace shell { | 23 namespace shell { |
| 24 namespace test { | 24 namespace test { |
| 25 | 25 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 54 BindingSet<LifecycleControl> bindings_; | 54 BindingSet<LifecycleControl> bindings_; |
| 55 scoped_ptr<ShellConnection> connection_; | 55 scoped_ptr<ShellConnection> connection_; |
| 56 | 56 |
| 57 DISALLOW_COPY_AND_ASSIGN(AppClient); | 57 DISALLOW_COPY_AND_ASSIGN(AppClient); |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 } // namespace test | 60 } // namespace test |
| 61 } // namespace shell | 61 } // namespace shell |
| 62 } // namespace mojo | 62 } // namespace mojo |
| 63 | 63 |
| 64 #endif // MOJO_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_ | 64 #endif // SERVICES_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_ |
| OLD | NEW |