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

Unified Diff: mojo/examples/wm_flow/wm/wm.cc

Issue 441853002: mojo: first take on removing mojo_main_{chromium,standalone}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gn 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/wm_flow/wm/wm.cc
diff --git a/mojo/examples/wm_flow/wm/wm.cc b/mojo/examples/wm_flow/wm/wm.cc
index 4fa492d5976ad1348048ecbcd8f504bbce73b3d3..35d67e71e41c24d2872b6a890604a0d50313cc03 100644
--- a/mojo/examples/wm_flow/wm/wm.cc
+++ b/mojo/examples/wm_flow/wm/wm.cc
@@ -3,7 +3,10 @@
// found in the LICENSE file.
#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_runner_chromium.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/public/cpp/system/main.h"
#include "mojo/services/public/cpp/view_manager/view_manager.h"
#include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
#include "mojo/services/public/cpp/view_manager/view_observer.h"
@@ -117,11 +120,7 @@ class SimpleWM : public mojo::ApplicationDelegate,
} // namespace examples
-namespace mojo {
-
-// static
-ApplicationDelegate* ApplicationDelegate::Create() {
- return new examples::SimpleWM;
+MojoResult MojoMain(MojoHandle shell_handle) {
+ mojo::ApplicationRunnerChromium runner(new examples::SimpleWM);
+ return runner.Run(shell_handle);
}
-
-} // namespace

Powered by Google App Engine
This is Rietveld 408576698