| Index: blimp/client/android/blimp_library_loader.cc
|
| diff --git a/blimp/client/android/blimp_library_loader.cc b/blimp/client/android/blimp_library_loader.cc
|
| index 9668850e3571d7dc303c87971a22f2809990c394..5a4fdff4adbe4cc8befad864df0906747f0d370b 100644
|
| --- a/blimp/client/android/blimp_library_loader.cc
|
| +++ b/blimp/client/android/blimp_library_loader.cc
|
| @@ -11,32 +11,16 @@
|
| #include "base/android/jni_android.h"
|
| #include "base/android/library_loader/library_loader_hooks.h"
|
| #include "base/bind.h"
|
| -#include "base/lazy_instance.h"
|
| -#include "base/logging.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "blimp/client/android/blimp_jni_registrar.h"
|
| +#include "blimp/client/blimp_startup.h"
|
| #include "jni/BlimpLibraryLoader_jni.h"
|
| #include "ui/gl/gl_surface.h"
|
|
|
| namespace {
|
|
|
| -base::LazyInstance<scoped_ptr<base::MessageLoopForUI>> g_main_message_loop =
|
| - LAZY_INSTANCE_INITIALIZER;
|
| -
|
| bool OnLibrariesLoaded(JNIEnv* env, jclass clazz) {
|
| - logging::LoggingSettings settings;
|
| - settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
|
| - logging::InitLogging(settings);
|
| -
|
| - // Disable process info prefixes on log lines. These can be obtained via "adb
|
| - // logcat -v threadtime".
|
| - logging::SetLogItems(false, // Process ID
|
| - false, // Thread ID
|
| - false, // Timestamp
|
| - false); // Tick count
|
| - VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
|
| - << ", default verbosity = " << logging::GetVlogVerbosity();
|
| -
|
| + blimp::InitializeLogging();
|
| return true;
|
| }
|
|
|
| @@ -59,19 +43,10 @@ bool RegisterJni(JNIEnv* env) {
|
|
|
| namespace blimp {
|
|
|
| -static jboolean InitializeBlimp(JNIEnv* env,
|
| - const JavaParamRef<jclass>& clazz) {
|
| - // TODO(dtrainor): Start the runner?
|
| - return true;
|
| -}
|
| -
|
| static jboolean StartBlimp(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
|
| - // TODO(dtrainor): Initialize ICU?
|
| -
|
| - if (!gfx::GLSurface::InitializeOneOff())
|
| + if (!blimp::InitializeMainMessageLoop())
|
| return false;
|
|
|
| - g_main_message_loop.Get().reset(new base::MessageLoopForUI);
|
| base::MessageLoopForUI::current()->Start();
|
|
|
| return true;
|
|
|