| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/client/jni/chromoting_jni_runtime.h" | 5 #include "remoting/client/jni/chromoting_jni_runtime.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 // points for JNI calls from Java into C++. | 39 // points for JNI calls from Java into C++. |
| 40 | 40 |
| 41 static void LoadNative(JNIEnv* env, jclass clazz, jobject context) { | 41 static void LoadNative(JNIEnv* env, jclass clazz, jobject context) { |
| 42 base::android::ScopedJavaLocalRef<jobject> context_activity(env, context); | 42 base::android::ScopedJavaLocalRef<jobject> context_activity(env, context); |
| 43 base::android::InitApplicationContext(env, context_activity); | 43 base::android::InitApplicationContext(env, context_activity); |
| 44 | 44 |
| 45 // The google_apis functions check the command-line arguments to make sure no | 45 // The google_apis functions check the command-line arguments to make sure no |
| 46 // runtime API keys have been specified by the environment. Unfortunately, we | 46 // runtime API keys have been specified by the environment. Unfortunately, we |
| 47 // neither launch Chromium nor have a command line, so we need to prevent | 47 // neither launch Chromium nor have a command line, so we need to prevent |
| 48 // them from DCHECKing out when they go looking. | 48 // them from DCHECKing out when they go looking. |
| 49 CommandLine::Init(0, NULL); | 49 base::CommandLine::Init(0, NULL); |
| 50 | 50 |
| 51 // Create the singleton now so that the Chromoting threads will be set up. | 51 // Create the singleton now so that the Chromoting threads will be set up. |
| 52 remoting::ChromotingJniRuntime::GetInstance(); | 52 remoting::ChromotingJniRuntime::GetInstance(); |
| 53 } | 53 } |
| 54 | 54 |
| 55 static jstring GetApiKey(JNIEnv* env, jclass clazz) { | 55 static jstring GetApiKey(JNIEnv* env, jclass clazz) { |
| 56 return ConvertUTF8ToJavaString( | 56 return ConvertUTF8ToJavaString( |
| 57 env, google_apis::GetAPIKey().c_str()).Release(); | 57 env, google_apis::GetAPIKey().c_str()).Release(); |
| 58 } | 58 } |
| 59 | 59 |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 JNIEnv* env = base::android::AttachCurrentThread(); | 297 JNIEnv* env = base::android::AttachCurrentThread(); |
| 298 Java_JniInterface_redrawGraphicsInternal(env); | 298 Java_JniInterface_redrawGraphicsInternal(env); |
| 299 } | 299 } |
| 300 | 300 |
| 301 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) { | 301 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) { |
| 302 base::android::DetachFromVM(); | 302 base::android::DetachFromVM(); |
| 303 waiter->Signal(); | 303 waiter->Signal(); |
| 304 } | 304 } |
| 305 | 305 |
| 306 } // namespace remoting | 306 } // namespace remoting |
| OLD | NEW |