| Index: blimp/client/public/contents/blimp_contents.h
|
| diff --git a/blimp/client/public/contents/blimp_contents.h b/blimp/client/public/contents/blimp_contents.h
|
| index b2658e82ede8a3eacb2881b1a4773edfc01ed504..37dd9e4ab7caac9f4d7467db58368978e6ff1ca5 100644
|
| --- a/blimp/client/public/contents/blimp_contents.h
|
| +++ b/blimp/client/public/contents/blimp_contents.h
|
| @@ -45,6 +45,12 @@ class BlimpContents : public base::SupportsUserData {
|
| virtual void Hide() = 0;
|
|
|
| #if defined(OS_ANDROID)
|
| + // Returns the native BlimpContents corresponding to a Java object of the type
|
| + // org.chromium.blimp.BlimpContents or nullptr if the lookup fails.
|
| + static BlimpContents* FromJavaObject(
|
| + JNIEnv* env,
|
| + const base::android::JavaRef<jobject>& jobj);
|
| +
|
| // Returns a Java object of the type BlimpContents for the given
|
| // BlimpContents.
|
| virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;
|
|
|