Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / mojo / shell / desktop / mojo_main.cc

diff --git a/src/mojo/shell/desktop/mojo_main.cc b/src/mojo/shell/desktop/mojo_main.cc
index bf1f973..9be9647 100644 (file)
--- a/src/mojo/shell/desktop/mojo_main.cc
+++ b/src/mojo/shell/desktop/mojo_main.cc
@@ -6,18 +6,23 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
+#include "mojo/shell/context.h"
+#include "mojo/shell/init.h"
 #include "mojo/shell/run.h"
+#include "ui/gl/gl_surface.h"
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   CommandLine::Init(argc, argv);
 
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  mojo::shell::InitializeLogging();
+
+  gfx::GLSurface::InitializeOneOff();
+
+  base::MessageLoop message_loop;
   mojo::shell::Context context;
+  message_loop.PostTask(FROM_HERE, base::Bind(mojo::shell::Run, &context));
 
-  message_loop.PostTask(FROM_HERE, base::Bind(mojo::shell::Run,
-                                              &context));
   message_loop.Run();
-
   return 0;
 }