Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Unified Diff: mojo/public/cpp/application/application_impl.h

Issue 441853002: mojo: first take on removing mojo_main_{chromium,standalone}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/public/cpp/application/DEPS ('k') | mojo/public/cpp/application/application_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e16299fa6d291b708a11afb791ff77bc70fc62fe 100644
--- a/mojo/public/cpp/application/application_impl.h
+++ b/mojo/public/cpp/application/application_impl.h
@@ -13,24 +13,6 @@
#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;
@@ -70,7 +52,6 @@ class ApplicationDelegate;
//
class ApplicationImpl : public InterfaceImpl<Application> {
public:
- explicit ApplicationImpl(ApplicationDelegate* delegate);
ApplicationImpl(ApplicationDelegate* delegate,
ScopedMessagePipeHandle shell_handle);
ApplicationImpl(ApplicationDelegate* delegate,
@@ -99,15 +80,12 @@ class ApplicationImpl : public InterfaceImpl<Application> {
MOJO_DISALLOW_COPY_AND_ASSIGN(ShellPtrWatcher);
};
- friend MojoResult (::MojoMain)(MojoHandle);
-
void BindShell(ScopedMessagePipeHandle shell_handle);
- void BindShell(MojoHandle shell_handle);
void ClearConnections();
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,
« no previous file with comments | « mojo/public/cpp/application/DEPS ('k') | mojo/public/cpp/application/application_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698