| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/session/blimp_client_session_android.h" | 5 #include "blimp/client/session/blimp_client_session_android.h" |
| 6 | 6 |
| 7 #include "blimp/client/session/tab_control_feature.h" |
| 7 #include "jni/BlimpClientSession_jni.h" | 8 #include "jni/BlimpClientSession_jni.h" |
| 8 | 9 |
| 9 namespace blimp { | 10 namespace blimp { |
| 10 namespace client { | 11 namespace client { |
| 12 namespace { |
| 13 const int kDummyTabId = 0; |
| 14 } // namespace |
| 11 | 15 |
| 12 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { | 16 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |
| 13 return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid(env, jobj)); | 17 return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid(env, jobj)); |
| 14 } | 18 } |
| 15 | 19 |
| 16 // static | 20 // static |
| 17 bool BlimpClientSessionAndroid::RegisterJni(JNIEnv* env) { | 21 bool BlimpClientSessionAndroid::RegisterJni(JNIEnv* env) { |
| 18 return RegisterNativesImpl(env); | 22 return RegisterNativesImpl(env); |
| 19 } | 23 } |
| 20 | 24 |
| 21 // static | 25 // static |
| 22 BlimpClientSessionAndroid* BlimpClientSessionAndroid::FromJavaObject( | 26 BlimpClientSessionAndroid* BlimpClientSessionAndroid::FromJavaObject( |
| 23 JNIEnv* env, | 27 JNIEnv* env, |
| 24 jobject jobj) { | 28 jobject jobj) { |
| 25 return reinterpret_cast<BlimpClientSessionAndroid*>( | 29 return reinterpret_cast<BlimpClientSessionAndroid*>( |
| 26 Java_BlimpClientSession_getNativePtr(env, jobj)); | 30 Java_BlimpClientSession_getNativePtr(env, jobj)); |
| 27 } | 31 } |
| 28 | 32 |
| 29 BlimpClientSessionAndroid::BlimpClientSessionAndroid( | 33 BlimpClientSessionAndroid::BlimpClientSessionAndroid( |
| 30 JNIEnv* env, | 34 JNIEnv* env, |
| 31 const base::android::JavaParamRef<jobject>& jobj) | 35 const base::android::JavaParamRef<jobject>& jobj) |
| 32 : BlimpClientSession() { | 36 : BlimpClientSession() { |
| 33 java_obj_.Reset(env, jobj); | 37 java_obj_.Reset(env, jobj); |
| 38 |
| 39 // Create a single tab's WebContents. |
| 40 // TODO(kmarshall): Remove this once we add tab-literacy to Blimp. |
| 41 GetTabControlFeature()->CreateTab(kDummyTabId); |
| 34 } | 42 } |
| 35 | 43 |
| 36 BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} | 44 BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} |
| 37 | 45 |
| 38 void BlimpClientSessionAndroid::Destroy(JNIEnv* env, | 46 void BlimpClientSessionAndroid::Destroy(JNIEnv* env, |
| 39 const JavaParamRef<jobject>& jobj) { | 47 const JavaParamRef<jobject>& jobj) { |
| 40 delete this; | 48 delete this; |
| 41 } | 49 } |
| 42 | 50 |
| 43 } // namespace client | 51 } // namespace client |
| 44 } // namespace blimp | 52 } // namespace blimp |
| OLD | NEW |