diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-11 20:29:31 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-11 20:29:31 +0000 |
| commit | 69ad2d3c39d10d85f7cba748a4272fe397742e88 (patch) | |
| tree | f83f237848092142d5c736ff50ba5f0bcf0cae01 /base/android/jni_android.h | |
| parent | b895cc531472fc5392ee3ed1414c6a95b5c4c4b8 (diff) | |
| download | chromium_src-69ad2d3c39d10d85f7cba748a4272fe397742e88.zip chromium_src-69ad2d3c39d10d85f7cba748a4272fe397742e88.tar.gz chromium_src-69ad2d3c39d10d85f7cba748a4272fe397742e88.tar.bz2 | |
Android: Allow duplicate calls to InitApplicationContext.
Allow InitApplicationContext to be called more than once as long as the
same context is passed each time. This will make it possible for
AwCookieManager to make use of certain JNI functions before Chromium has
been initialised without needing to keep track of whether it's already
passed the application context to native or not.
BUG=304813
NOTRY=true
Review URL: https://codereview.chromium.org/54923002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android/jni_android.h')
| -rw-r--r-- | base/android/jni_android.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/android/jni_android.h b/base/android/jni_android.h index 81ce3fd..7a00632 100644 --- a/base/android/jni_android.h +++ b/base/android/jni_android.h @@ -41,7 +41,8 @@ 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(const JavaRef<jobject>& context); +BASE_EXPORT void InitApplicationContext(JNIEnv* env, + const JavaRef<jobject>& context); // Gets a global ref to the application context set with // InitApplicationContext(). Ownership is retained by the function - the caller |