| Index: blimp/client/core/contents/blimp_contents_impl.cc
|
| diff --git a/blimp/client/core/contents/blimp_contents_impl.cc b/blimp/client/core/contents/blimp_contents_impl.cc
|
| index 5cd4bb18f3d4b3a25c3a81fcd3f254ba768c95b4..b30a970815589eae859bb7dd2860fc84da46ea2c 100644
|
| --- a/blimp/client/core/contents/blimp_contents_impl.cc
|
| +++ b/blimp/client/core/contents/blimp_contents_impl.cc
|
| @@ -67,6 +67,18 @@ BlimpContentsImplAndroid* BlimpContentsImpl::GetBlimpContentsImplAndroid() {
|
| return blimp_contents_impl_android;
|
| }
|
|
|
| +// static
|
| +BlimpContents* BlimpContents::FromJavaObject(
|
| + JNIEnv* env,
|
| + const base::android::JavaRef<jobject>& jobj) {
|
| + BlimpContentsImplAndroid* blimp_contents_impl_android =
|
| + BlimpContentsImplAndroid::FromJavaObject(env, jobj);
|
| + if (!blimp_contents_impl_android) {
|
| + return nullptr;
|
| + }
|
| + return blimp_contents_impl_android->blimp_contents_impl();
|
| +}
|
| +
|
| #endif // defined(OS_ANDROID)
|
|
|
| BlimpNavigationControllerImpl& BlimpContentsImpl::GetNavigationController() {
|
|
|