| Index: blimp/client/core/context/android/blimp_client_context_impl_android.cc
|
| diff --git a/blimp/client/core/context/android/blimp_client_context_impl_android.cc b/blimp/client/core/context/android/blimp_client_context_impl_android.cc
|
| index 198f3872238aa6173f8ffdac7e01d360e763366f..842ea4a762f2a7ee671459b059f77a5f00ff9530 100644
|
| --- a/blimp/client/core/context/android/blimp_client_context_impl_android.cc
|
| +++ b/blimp/client/core/context/android/blimp_client_context_impl_android.cc
|
| @@ -13,6 +13,7 @@
|
| #include "blimp/client/core/contents/blimp_contents_impl.h"
|
| #include "blimp/client/core/feedback/android/blimp_feedback_data_android.h"
|
| #include "blimp/client/core/settings/android/blimp_settings_android.h"
|
| +#include "blimp/client/core/settings/android/settings_android.h"
|
| #include "blimp/client/public/blimp_client_context.h"
|
| #include "blimp/client/public/compositor/compositor_dependencies.h"
|
| #include "jni/BlimpClientContextImpl_jni.h"
|
| @@ -124,5 +125,12 @@ void BlimpClientContextImplAndroid::InitSettingsPage(
|
| settings_android->SetDelegate(this);
|
| }
|
|
|
| +base::android::ScopedJavaLocalRef<jobject>
|
| +BlimpClientContextImplAndroid::GetSettings(
|
| + JNIEnv* env,
|
| + const base::android::JavaRef<jobject>& jobj) {
|
| + return static_cast<SettingsAndroid*>(settings())->GetJavaObject();
|
| +}
|
| +
|
| } // namespace client
|
| } // namespace blimp
|
|
|