Upstream version 10.39.225.0

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

diff --git a/src/mojo/shell/android/mojo_main.cc b/src/mojo/shell/android/mojo_main.cc
index 951742f..832e0aa 100644 (file)
--- a/src/mojo/shell/android/mojo_main.cc
+++ b/src/mojo/shell/android/mojo_main.cc
@@ -4,20 +4,20 @@
 
 #include "mojo/shell/android/mojo_main.h"
 
+#include "base/android/java_handler_thread.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "jni/MojoMain_jni.h"
-#include "mojo/public/shell/application.h"
-#include "mojo/services/native_viewport/native_viewport_service.h"
+#include "mojo/application_manager/application_loader.h"
+#include "mojo/application_manager/application_manager.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
-#include "mojo/shell/run.h"
-#include "mojo/shell/service_manager.h"
 #include "ui/gl/gl_surface_egl.h"
 
 using base::LazyInstance;
@@ -32,34 +32,34 @@ LazyInstance<scoped_ptr<base::MessageLoop> > g_java_message_loop =
 LazyInstance<scoped_ptr<shell::Context> > g_context =
     LAZY_INSTANCE_INITIALIZER;
 
-class NativeViewportServiceLoader : public shell::ServiceManager::Loader {
- public:
-  NativeViewportServiceLoader() {}
-  virtual ~NativeViewportServiceLoader() {}
-
- private:
-  virtual void Load(const GURL& url,
-                    ScopedShellHandle service_handle)
-      MOJO_OVERRIDE {
-    app_.reset(CreateNativeViewportService(g_context.Get().get(),
-                                           service_handle.Pass()));
-  }
-  scoped_ptr<Application> app_;
-};
+LazyInstance<scoped_ptr<base::android::JavaHandlerThread> > g_shell_thread =
+    LAZY_INSTANCE_INITIALIZER;
 
-LazyInstance<scoped_ptr<NativeViewportServiceLoader> >
-    g_viewport_service_loader = LAZY_INSTANCE_INITIALIZER;
+void RunShell(std::vector<GURL> app_urls) {
+  shell::Context* context = g_context.Pointer()->get();
+  context->Init();
+  context->set_ui_loop(g_java_message_loop.Get().get());
+  for (std::vector<GURL>::const_iterator it = app_urls.begin();
+       it != app_urls.end(); ++it) {
+    context->Run(*it);
+  }
+}
 
-}  // namspace
+}  // namespace
 
 static void Init(JNIEnv* env, jclass clazz, jobject context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
 
   base::android::InitApplicationContext(env, scoped_context);
 
-  CommandLine::Init(0, 0);
+  base::CommandLine::Init(0, 0);
   mojo::shell::InitializeLogging();
 
+  // We want ~MessageLoop to happen prior to ~Context. Initializing
+  // LazyInstances is akin to stack-allocating objects; their destructors
+  // will be invoked first-in-last-out.
+  shell::Context* shell_context = new shell::Context();
+  g_context.Get().reset(shell_context);
   g_java_message_loop.Get().reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 
@@ -69,35 +69,22 @@ static void Init(JNIEnv* env, jclass clazz, jobject context) {
   gfx::GLSurface::InitializeOneOff();
 }
 
-static void Start(JNIEnv* env, jclass clazz, jobject context, jstring jurl) {
-  std::string app_url;
+static void Start(JNIEnv* env, jclass clazz, jstring jurl) {
+  std::vector<GURL> app_urls;
 #if defined(MOJO_SHELL_DEBUG_URL)
-  app_url = MOJO_SHELL_DEBUG_URL;
+  app_urls.push_back(GURL(MOJO_SHELL_DEBUG_URL));
   // Sleep for 5 seconds to give the debugger a chance to attach.
   sleep(5);
 #else
   if (jurl)
-    app_url = base::android::ConvertJavaStringToUTF8(env, jurl);
+    app_urls.push_back(GURL(base::android::ConvertJavaStringToUTF8(env, jurl)));
 #endif
-  if (!app_url.empty()) {
-    std::vector<std::string> argv;
-    argv.push_back("mojo_shell");
-    argv.push_back(app_url);
-    CommandLine::ForCurrentProcess()->InitFromArgv(argv);
-  }
-
-  base::android::ScopedJavaGlobalRef<jobject> activity;
-  activity.Reset(env, context);
 
-  shell::Context* shell_context = new shell::Context();
-  shell_context->set_activity(activity.obj());
-  g_viewport_service_loader.Get().reset(new NativeViewportServiceLoader());
-  shell_context->service_manager()->SetLoaderForURL(
-      g_viewport_service_loader.Get().get(),
-      GURL("mojo:mojo_native_viewport_service"));
-
-  g_context.Get().reset(shell_context);
-  shell::Run(shell_context);
+  g_shell_thread.Get().reset(
+      new base::android::JavaHandlerThread("shell_thread"));
+  g_shell_thread.Get()->Start();
+  g_shell_thread.Get()->message_loop()->PostTask(
+      FROM_HERE, base::Bind(&RunShell, app_urls));
 }
 
 bool RegisterMojoMain(JNIEnv* env) {