Index: base/android/jni_android.h |
diff --git a/base/android/jni_android.h b/base/android/jni_android.h |
index 9df904100edcfaea37fda0834eec1ead4d13628a..04507e38fc961974adf7951d8f58e45a1f930e5e 100644 |
--- a/base/android/jni_android.h |
+++ b/base/android/jni_android.h |
@@ -10,6 +10,7 @@ |
#include <string> |
+#include "base/android/context_utils.h" |
#include "base/android/scoped_java_ref.h" |
#include "base/atomicops.h" |
#include "base/base_export.h" |
@@ -47,19 +48,12 @@ BASE_EXPORT JNIEnv* AttachCurrentThreadWithName(const std::string& thread_name); |
// Detaches the current thread from VM if it is attached. |
BASE_EXPORT void DetachFromVM(); |
-// Initializes the global JVM. It is not necessarily called before |
-// InitApplicationContext(). |
+// Initializes the global JVM. |
BASE_EXPORT void InitVM(JavaVM* vm); |
// Returns true if the global JVM has been initialized. |
BASE_EXPORT bool IsVMInitialized(); |
-// Initializes the global application context object. The |context| can be any |
-// valid reference to the application context. Internally holds a global ref to |
-// the context. InitVM and InitApplicationContext maybe called in either order. |
-BASE_EXPORT void InitApplicationContext(JNIEnv* env, |
- const JavaRef<jobject>& context); |
- |
// Initializes the global ClassLoader used by the GetClass and LazyGetClass |
// methods. This is needed because JNI will use the base ClassLoader when there |
// is no Java code on the stack. The base ClassLoader doesn't know about any of |
@@ -69,11 +63,6 @@ BASE_EXPORT void InitReplacementClassLoader( |
JNIEnv* env, |
const JavaRef<jobject>& class_loader); |
-// Gets a global ref to the application context set with |
-// InitApplicationContext(). Ownership is retained by the function - the caller |
-// must NOT release it. |
-const BASE_EXPORT jobject GetApplicationContext(); |
- |
// Finds the class named |class_name| and returns it. |
// Use this method instead of invoking directly the JNI FindClass method (to |
// prevent leaking local references). |