diff options
| author | torne <torne@chromium.org> | 2015-11-24 02:30:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-24 10:31:56 +0000 |
| commit | 961a488f6a5d8c82b576444054f5d26b3f8a6877 (patch) | |
| tree | 7aa3fdf6656de41b86f2a17bf3f58a276c2f2c54 /remoting/client | |
| parent | 4bc70b49a4d47fa390b64c93a1dc1c5d99f14c0a (diff) | |
| download | chromium_src-961a488f6a5d8c82b576444054f5d26b3f8a6877.zip chromium_src-961a488f6a5d8c82b576444054f5d26b3f8a6877.tar.gz chromium_src-961a488f6a5d8c82b576444054f5d26b3f8a6877.tar.bz2 | |
Define a Java-side global application context.
Instead of each user of base setting the native-side global app context
separately, introduce a Java-side global app context, which is always
in sync with the native-side one. Switch most callers to setting
it on the Java side, except where this is problematic.
Callers of ApplicationStatus.getApplicationContext will be updated
incrementally in followup CLs once it's been verified that they only
require a Context and not a BaseChromiumApplication.
BUG=552419
Review URL: https://codereview.chromium.org/1407233017
Cr-Commit-Position: refs/heads/master@{#361306}
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/jni/chromoting_jni_runtime.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/remoting/client/jni/chromoting_jni_runtime.cc b/remoting/client/jni/chromoting_jni_runtime.cc index af778c3..335e1ff 100644 --- a/remoting/client/jni/chromoting_jni_runtime.cc +++ b/remoting/client/jni/chromoting_jni_runtime.cc @@ -38,11 +38,7 @@ bool RegisterChromotingJniRuntime(JNIEnv* env) { // Implementation of stubs defined in JniInterface_jni.h. These are the entry // points for JNI calls from Java into C++. -static void LoadNative(JNIEnv* env, - const JavaParamRef<jclass>& clazz, - const JavaParamRef<jobject>& context) { - base::android::InitApplicationContext(env, context); - +static void LoadNative(JNIEnv* env, const JavaParamRef<jclass>& clazz) { // The google_apis functions check the command-line arguments to make sure no // runtime API keys have been specified by the environment. Unfortunately, we // neither launch Chromium nor have a command line, so we need to prevent |