OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "blimp/client/core/android/blimp_client_context_impl_android.h" | 5 #include "blimp/client/core/android/blimp_client_context_impl_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
10 #include "blimp/client/core/contents/blimp_contents_impl.h" | 10 #include "blimp/client/core/contents/blimp_contents_impl.h" |
11 #include "blimp/client/core/settings/android/blimp_settings_android.h" | |
11 #include "blimp/client/public/blimp_client_context.h" | 12 #include "blimp/client/public/blimp_client_context.h" |
12 #include "jni/BlimpClientContextImpl_jni.h" | 13 #include "jni/BlimpClientContextImpl_jni.h" |
13 | 14 |
14 namespace blimp { | 15 namespace blimp { |
15 namespace client { | 16 namespace client { |
16 | 17 |
17 // static | 18 // static |
18 bool BlimpClientContextImplAndroid::RegisterJni(JNIEnv* env) { | 19 bool BlimpClientContextImplAndroid::RegisterJni(JNIEnv* env) { |
19 return RegisterNativesImpl(env); | 20 return RegisterNativesImpl(env); |
20 } | 21 } |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 Java_BlimpClientContextImpl_getAssignerUrl(env, java_obj_); | 78 Java_BlimpClientContextImpl_getAssignerUrl(env, java_obj_); |
78 GURL assigner_url = GURL(ConvertJavaStringToUTF8(env, jurl)); | 79 GURL assigner_url = GURL(ConvertJavaStringToUTF8(env, jurl)); |
79 DCHECK(assigner_url.is_valid()); | 80 DCHECK(assigner_url.is_valid()); |
80 return assigner_url; | 81 return assigner_url; |
81 } | 82 } |
82 | 83 |
83 void BlimpClientContextImplAndroid::ConnectFromJava(JNIEnv* env, jobject jobj) { | 84 void BlimpClientContextImplAndroid::ConnectFromJava(JNIEnv* env, jobject jobj) { |
84 BlimpClientContextImpl::Connect(); | 85 BlimpClientContextImpl::Connect(); |
85 } | 86 } |
86 | 87 |
88 void BlimpClientContextImplAndroid::InitSettingsPage(JNIEnv* env, | |
89 jobject jobj, | |
90 jlong blimp_settings_ptr) { | |
91 BlimpSettingsAndroid* settings_android = | |
92 reinterpret_cast<BlimpSettingsAndroid*>(blimp_settings_ptr); | |
93 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
| |
94 } | |
95 | |
96 IdentitySource* BlimpClientContextImplAndroid::GetIdentitySource() { | |
97 if (!identity_source_) { | |
98 CreateIdentitySource(); | |
99 } | |
100 return identity_source_.get(); | |
101 } | |
102 | |
87 } // namespace client | 103 } // namespace client |
88 } // namespace blimp | 104 } // namespace blimp |
OLD | NEW |