mojo: first take on removing mojo_main_{chromium,standalone}.

mojo/examples/aura_demo/aura_demo.cc

Index: mojo/examples/aura_demo/aura_demo.cc
diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc
index cbed7f0945124495ed9abaec8ccb4abec0d9f4d4..c6a8daa38c087f16617a2b3e987c0c150dfd0f55 100644
--- a/mojo/examples/aura_demo/aura_demo.cc
+++ b/mojo/examples/aura_demo/aura_demo.cc
@@ -12,6 +12,9 @@
 #include "mojo/aura/window_tree_host_mojo_delegate.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_export.h"

[DaveMoore, 2014/08/18 23:41:03]

Nit: I don't think you need application_impl.h. This goes for pretty much all of
the users of ApplicationRunner...

Also, where is application_export.h?

[tim (not reviewing), 2014/08/19 00:06:29]

Ah, yeah. I was removing it from everywhere possible but a bunch of places
actually use ApplicationImpl (most files containing MojoMain also implement the
ApplicationDelegate and many of those make use of |app| passed to Initialize).

This one (and two others) fell through the cracks though. Fixed.  Also added
app_export.h

+#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_runner_chromium.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
@@ -200,10 +203,10 @@ class AuraDemo : public ApplicationDelegate,
 };
 
 }  // namespace examples
+}  // namespace mojo
 
-// static
-ApplicationDelegate* ApplicationDelegate::Create() {
-  return new examples::AuraDemo();
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
+    MojoHandle shell_handle) {

[DaveMoore, 2014/08/18 23:41:03]

I wonder if we should wrap this with our own MojoMain() that calls something
like ApplicationRunner::CreateRunner() (maybe a better name). This would provide
a few benefits:
1) App writers would get a link time error instead of a runtime one if they
forgot to define one.
2) We could eliminate the need to import application_export.h
3) We would get type checking on the arg
4) The line would be simpler

MojoResult ApplicationRunner::Create(MojoHandle shell_handle) {

[tim (not reviewing), 2014/08/19 00:11:05]

Where would this MojoMain live?  Right now a nice thing is that you must link
against the proper mojo_application_* target to get the associated
ApplicationRunner{Chromium}, and that brings in the proper environment (unlike
before where this was seperate).  I'd like to keep that coupled.

[DaveMoore, 2014/08/19 03:47:34]

How about putting MojoMain() in application_runner.cc and
application_runner_chromium.cc. That's where you would document what you have to
define so it would make sense.


On 2014/08/19 00:11:05, timsteele wrote:

+  mojo::ApplicationRunnerChromium runner(new mojo::examples::AuraDemo());
+  return runner.Run(shell_handle);
 }
-
-}  // namespace mojo