Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: webrtc/modules/utility/include/jvm_android.h

Issue 2903253004: Reland of Removes usage of native base::android::GetApplicationContext() (Closed)
Patch Set: Deprecated comment. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/utility/include/jvm_android.h
diff --git a/webrtc/modules/utility/include/jvm_android.h b/webrtc/modules/utility/include/jvm_android.h
index 51a0bd841a12d27a9d3af892e6a899659ba23dc3..60e15e57edb6d06bd44ae769bbb41da6a88f97ec 100644
--- a/webrtc/modules/utility/include/jvm_android.h
+++ b/webrtc/modules/utility/include/jvm_android.h
@@ -118,8 +118,7 @@ class JNIEnvironment {
// JNIEnv* jni = ::base::android::AttachCurrentThread();
// JavaVM* jvm = NULL;
// jni->GetJavaVM(&jvm);
-// jobject context = ::base::android::GetApplicationContext();
-// webrtc::JVM::Initialize(jvm, context);
+// webrtc::JVM::Initialize(jvm);
//
// // Header (.h) file of example class called User.
// std::unique_ptr<JNIEnvironment> env;
@@ -145,8 +144,13 @@ class JNIEnvironment {
// JVM::Uninitialize();
class JVM {
public:
- // Stores global handles to the Java VM interface and the application context.
+ // Stores global handles to the Java VM interface.
// Should be called once on a thread that is attached to the JVM.
+ static void Initialize(JavaVM* jvm);
+ // TODO(sakal): Remove once downstream dependencies have been updated.
+ // DEPRECATED (crbug.com/webrtc/7710): Old signature taking the Android
+ // context as a parameter. Currently passes in the context to the ContextUtils
+ // class.
static void Initialize(JavaVM* jvm, jobject context);
// Clears handles stored in Initialize(). Must be called on same thread as
// Initialize().
@@ -168,10 +172,9 @@ class JVM {
// TODO(henrika): can we make these private?
JavaVM* jvm() const { return jvm_; }
- jobject context() const { return context_; }
protected:
- JVM(JavaVM* jvm, jobject context);
+ JVM(JavaVM* jvm);
~JVM();
private:
@@ -179,7 +182,6 @@ class JVM {
rtc::ThreadChecker thread_checker_;
JavaVM* const jvm_;
- jobject context_;
};
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698