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

Unified Diff: mojo/examples/dbus_echo/dbus_echo_app.cc

Issue 441853002: mojo: first take on removing mojo_main_{chromium,standalone}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: seperate Run call 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
Index: mojo/examples/dbus_echo/dbus_echo_app.cc
diff --git a/mojo/examples/dbus_echo/dbus_echo_app.cc b/mojo/examples/dbus_echo/dbus_echo_app.cc
index ea18f8b96a8a601bac57bf571a96c4070815b681..888a96c6f72bc4dfa84b97712a9584f43ef931fe 100644
--- a/mojo/examples/dbus_echo/dbus_echo_app.cc
+++ b/mojo/examples/dbus_echo/dbus_echo_app.cc
@@ -8,7 +8,9 @@
#include "base/bind.h"
#include "base/logging.h"
#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_export.h"
#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_runner.h"
#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/cpp/system/core.h"
#include "mojo/public/cpp/system/macros.h"
@@ -42,10 +44,10 @@ class DBusEchoApp : public ApplicationDelegate {
};
} // namespace examples
+} // namespace mojo
-// static
-ApplicationDelegate* ApplicationDelegate::Create() {
- return new examples::DBusEchoApp();
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
+ MojoHandle shell_handle) {
+ mojo::ApplicationRunner runner(new mojo::examples::DBusEchoApp());
+ return runner.Run(shell_handle);
}
-
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698