| 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 5a4fdff4adbe4cc8befad864df0906747f0d370b..61ce8b6d07b93d7d2e0e17ade6dd2eb8920f329c 100644
|
| --- a/blimp/client/android/blimp_library_loader.cc
|
| +++ b/blimp/client/android/blimp_library_loader.cc
|
| @@ -20,7 +20,7 @@
|
| namespace {
|
|
|
| bool OnLibrariesLoaded(JNIEnv* env, jclass clazz) {
|
| - blimp::InitializeLogging();
|
| + blimp::client::InitializeLogging();
|
| return true;
|
| }
|
|
|
| @@ -33,7 +33,7 @@ bool RegisterJni(JNIEnv* env) {
|
| if (!base::android::RegisterJni(env))
|
| return false;
|
|
|
| - if (!blimp::RegisterBlimpJni(env))
|
| + if (!blimp::client::RegisterBlimpJni(env))
|
| return false;
|
|
|
| return true;
|
| @@ -42,9 +42,10 @@ bool RegisterJni(JNIEnv* env) {
|
| } // namespace
|
|
|
| namespace blimp {
|
| +namespace client {
|
|
|
| static jboolean StartBlimp(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
|
| - if (!blimp::InitializeMainMessageLoop())
|
| + if (!InitializeMainMessageLoop())
|
| return false;
|
|
|
| base::MessageLoopForUI::current()->Start();
|
| @@ -56,6 +57,7 @@ bool RegisterBlimpLibraryLoaderJni(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
| }
|
|
|
| +} // namespace client
|
| } // namespace blimp
|
|
|
| JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
|
|