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

Unified Diff: mojo/examples/surfaces_app/child_gl_app.cc

Issue 504443002: Update mojo surfaces bindings and mojo/cc/ glue (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
Index: mojo/examples/surfaces_app/child_gl_app.cc
diff --git a/mojo/examples/surfaces_app/child_gl_app.cc b/mojo/examples/surfaces_app/child_gl_app.cc
index ae6ca0c4d78519bcb1628571ee433e59c3ec583e..0718802e5d6c9da2aff6de164e0ca1ce6952c020 100644
--- a/mojo/examples/surfaces_app/child_gl_app.cc
+++ b/mojo/examples/surfaces_app/child_gl_app.cc
@@ -4,9 +4,11 @@
#include "base/threading/platform_thread.h"
#include "mojo/examples/surfaces_app/child_gl_impl.h"
+#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#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/bindings/string.h"
#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
@@ -51,9 +53,9 @@ class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> {
} // namespace examples
sky 2014/08/22 22:20:09 nit: remove 55 (just line 15/16 don't have a newli
-// static
-ApplicationDelegate* ApplicationDelegate::Create() {
- return new examples::ChildGLApp();
-}
-
} // namespace mojo
+
+MojoResult MojoMain(MojoHandle shell_handle) {
+ mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp);
+ return runner.Run(shell_handle);
+}

Powered by Google App Engine
This is Rietveld 408576698