| Index: base/android/jni_weak_ref.h
|
| diff --git a/base/android/jni_weak_ref.h b/base/android/jni_weak_ref.h
|
| index c8510465698510d90d8cf200a2657a7aaf42371e..2ae5cce02755c2833a2ab97acd71428a63cec2a5 100644
|
| --- a/base/android/jni_weak_ref.h
|
| +++ b/base/android/jni_weak_ref.h
|
| @@ -18,14 +18,18 @@ class BASE_EXPORT JavaObjectWeakGlobalRef {
|
| public:
|
| JavaObjectWeakGlobalRef();
|
| JavaObjectWeakGlobalRef(const JavaObjectWeakGlobalRef& orig);
|
| + JavaObjectWeakGlobalRef(JavaObjectWeakGlobalRef&& orig);
|
| JavaObjectWeakGlobalRef(JNIEnv* env, jobject obj);
|
| + JavaObjectWeakGlobalRef(JNIEnv* env,
|
| + const base::android::JavaRef<jobject>& obj);
|
| virtual ~JavaObjectWeakGlobalRef();
|
|
|
| void operator=(const JavaObjectWeakGlobalRef& rhs);
|
| + void operator=(JavaObjectWeakGlobalRef&& rhs);
|
|
|
| base::android::ScopedJavaLocalRef<jobject> get(JNIEnv* env) const;
|
|
|
| - bool is_empty() const { return obj_ == NULL; }
|
| + bool is_empty() const { return obj_ == nullptr; }
|
|
|
| void reset();
|
|
|
|
|