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

Unified Diff: mojo/services/view_manager/main.cc

Issue 441853002: mojo: first take on removing mojo_main_{chromium,standalone}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/services/view_manager/main.cc
diff --git a/mojo/services/view_manager/main.cc b/mojo/services/view_manager/main.cc
index 9f6285ffe99004f083650de700cfc596909b8270..12e43ffa573dfea0c0ea68368a0958eede4c8de1 100644
--- a/mojo/services/view_manager/main.cc
+++ b/mojo/services/view_manager/main.cc
@@ -4,6 +4,8 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_export.h"
+#include "mojo/public/cpp/application/application_runner_chromium.h"
#include "mojo/services/view_manager/view_manager_init_service_context.h"
#include "mojo/services/view_manager/view_manager_init_service_impl.h"
@@ -39,10 +41,11 @@ class ViewManagerApp : public ApplicationDelegate,
};
} // namespace service
+} // namespace mojo
-// static
-ApplicationDelegate* ApplicationDelegate::Create() {
- return new mojo::service::ViewManagerApp();
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
+ MojoHandle shell_handle) {
+ mojo::ApplicationRunnerChromium app;
+ app.take_delegate(make_scoped_delegate(new mojo::service::ViewManagerApp));
+ return app.Run(shell_handle);
}
-
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698