| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ | 5 #ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ |
| 6 #define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ | 6 #define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "mojo/public/cpp/application/application_connection.h" | 9 #include "mojo/public/cpp/application/application_connection.h" |
| 10 #include "mojo/public/cpp/application/lib/service_connector.h" | 10 #include "mojo/public/cpp/application/lib/service_connector.h" |
| 11 #include "mojo/public/cpp/application/lib/service_registry.h" | 11 #include "mojo/public/cpp/application/lib/service_registry.h" |
| 12 #include "mojo/public/cpp/system/core.h" | 12 #include "mojo/public/cpp/system/core.h" |
| 13 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h" | 13 #include "mojo/public/interfaces/application/application.mojom.h" |
| 14 #include "mojo/public/interfaces/application/shell.mojom.h" |
| 14 | 15 |
| 15 #if defined(WIN32) | 16 #if defined(WIN32) |
| 16 #if !defined(CDECL) | 17 #if !defined(CDECL) |
| 17 #define CDECL __cdecl | 18 #define CDECL __cdecl |
| 18 #endif | 19 #endif |
| 19 #define APPLICATION_EXPORT __declspec(dllexport) | 20 #define APPLICATION_EXPORT __declspec(dllexport) |
| 20 #else | 21 #else |
| 21 #define CDECL | 22 #define CDECL |
| 22 #define APPLICATION_EXPORT __attribute__((visibility("default"))) | 23 #define APPLICATION_EXPORT __attribute__((visibility("default"))) |
| 23 #endif | 24 #endif |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 ServiceRegistryList outgoing_service_registries_; | 103 ServiceRegistryList outgoing_service_registries_; |
| 103 ApplicationDelegate* delegate_; | 104 ApplicationDelegate* delegate_; |
| 104 ShellPtr shell_; | 105 ShellPtr shell_; |
| 105 | 106 |
| 106 MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl); | 107 MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl); |
| 107 }; | 108 }; |
| 108 | 109 |
| 109 } // namespace mojo | 110 } // namespace mojo |
| 110 | 111 |
| 111 #endif // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ | 112 #endif // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ |
| OLD | NEW |