| Index: blimp/client/core/android/blimp_client_context_impl_android.h
|
| diff --git a/blimp/client/core/android/blimp_client_context_impl_android.h b/blimp/client/core/android/blimp_client_context_impl_android.h
|
| index c38a59301a37ff38c0a434f95506c9df46045131..9b8d0fb598242a5ed5b87e0b28e342450909a781 100644
|
| --- a/blimp/client/core/android/blimp_client_context_impl_android.h
|
| +++ b/blimp/client/core/android/blimp_client_context_impl_android.h
|
| @@ -13,7 +13,8 @@ namespace blimp {
|
| namespace client {
|
|
|
| // JNI bridge between BlimpClientContextImpl in Java and C++.
|
| -class BlimpClientContextImplAndroid : public BlimpClientContextImpl {
|
| +class BlimpClientContextImplAndroid : public BlimpClientContextImpl,
|
| + public BlimpClientContextInternal {
|
| public:
|
| static bool RegisterJni(JNIEnv* env);
|
| static BlimpClientContextImplAndroid* FromJavaObject(JNIEnv* env,
|
| @@ -37,11 +38,18 @@ class BlimpClientContextImplAndroid : public BlimpClientContextImpl {
|
| // Start authentication flow from Java.
|
| void ConnectFromJava(JNIEnv* env, jobject jobj);
|
|
|
| + // Initialize blimp settings page, this involves setup neccessary data in
|
| + // native for setting page.
|
| + void InitSettingsPage(JNIEnv* env, jobject jobj, jlong blimp_settings_ptr);
|
| +
|
| protected:
|
| // BlimpClientContextImpl implementation.
|
| GURL GetAssignerURL() override;
|
|
|
| private:
|
| + // BlimpClientContextInternal implementation.
|
| + IdentitySource* GetIdentitySource() override;
|
| +
|
| base::android::ScopedJavaGlobalRef<jobject> java_obj_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BlimpClientContextImplAndroid);
|
|
|