Index: blimp/client/core/android/blimp_client_context_impl_android.cc |
diff --git a/blimp/client/core/android/blimp_client_context_impl_android.cc b/blimp/client/core/android/blimp_client_context_impl_android.cc |
index 83ff4d894e64d5da21cdfb90bb8743ccd79408ff..e8b8e40de8277d8783aac8587cf2ec9b54e1a79f 100644 |
--- a/blimp/client/core/android/blimp_client_context_impl_android.cc |
+++ b/blimp/client/core/android/blimp_client_context_impl_android.cc |
@@ -8,6 +8,7 @@ |
#include "base/android/jni_string.h" |
#include "base/android/scoped_java_ref.h" |
#include "blimp/client/core/contents/blimp_contents_impl.h" |
+#include "blimp/client/core/settings/android/blimp_settings_android.h" |
#include "blimp/client/public/blimp_client_context.h" |
#include "jni/BlimpClientContextImpl_jni.h" |
@@ -84,5 +85,20 @@ void BlimpClientContextImplAndroid::ConnectFromJava(JNIEnv* env, jobject jobj) { |
BlimpClientContextImpl::Connect(); |
} |
+void BlimpClientContextImplAndroid::InitSettingsPage(JNIEnv* env, |
+ jobject jobj, |
+ jlong blimp_settings_ptr) { |
+ BlimpSettingsAndroid* settings_android = |
+ reinterpret_cast<BlimpSettingsAndroid*>(blimp_settings_ptr); |
+ settings_android->SetIdentitySource(GetIdentitySource()); |
David Trainor- moved to gerrit
2016/08/29 05:12:24
A few questions around this:
- Why can't the base
xingliu
2016/08/30 04:47:42
Moved this to base class, and rename BlimpClientCo
|
+} |
+ |
+IdentitySource* BlimpClientContextImplAndroid::GetIdentitySource() { |
+ if (!identity_source_) { |
+ CreateIdentitySource(); |
+ } |
+ return identity_source_.get(); |
+} |
+ |
} // namespace client |
} // namespace blimp |