| Index: mojo/public/cpp/application/application_impl.h
|
| diff --git a/mojo/public/cpp/application/application_impl.h b/mojo/public/cpp/application/application_impl.h
|
| index 2a1a5969bfad2995f781bf5a980237182b4e4032..ef4f2a147b3f6242f288007dd49ad20f9ddd7689 100644
|
| --- a/mojo/public/cpp/application/application_impl.h
|
| +++ b/mojo/public/cpp/application/application_impl.h
|
| @@ -7,30 +7,13 @@
|
| #include <vector>
|
|
|
| #include "mojo/public/cpp/application/application_connection.h"
|
| +#include "mojo/public/cpp/application/application_export.h"
|
| #include "mojo/public/cpp/application/lib/service_connector.h"
|
| #include "mojo/public/cpp/application/lib/service_registry.h"
|
| #include "mojo/public/cpp/system/core.h"
|
| #include "mojo/public/interfaces/application/application.mojom.h"
|
| #include "mojo/public/interfaces/application/shell.mojom.h"
|
|
|
| -#if defined(WIN32)
|
| -#if !defined(CDECL)
|
| -#define CDECL __cdecl
|
| -#endif
|
| -#define APPLICATION_EXPORT __declspec(dllexport)
|
| -#else
|
| -#define CDECL
|
| -#define APPLICATION_EXPORT __attribute__((visibility("default")))
|
| -#endif
|
| -
|
| -// DSOs can either implement MojoMain directly or include
|
| -// mojo_main_{standalone|chromium}.cc in their project and implement
|
| -// ApplicationImpl::Create();
|
| -// TODO(davemoore): Establish this as part of our SDK for third party mojo
|
| -// application writers.
|
| -extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
|
| - MojoHandle service_provider_handle);
|
| -
|
| namespace mojo {
|
|
|
| class ApplicationDelegate;
|
| @@ -107,7 +90,7 @@ class ApplicationImpl : public InterfaceImpl<Application> {
|
| void OnShellError() { ClearConnections(); Terminate(); };
|
|
|
| // Quits the main run loop for this application.
|
| - void Terminate();
|
| + static void Terminate();
|
|
|
| // Application implementation.
|
| virtual void AcceptConnection(const String& requestor_url,
|
|
|