| 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/app/android/blimp_client_session_android.h" |
| 6 | 6 |
| 7 #include "blimp/client/session/tab_control_feature.h" | 7 #include "blimp/client/feature/tab_control_feature.h" |
| 8 #include "jni/BlimpClientSession_jni.h" | 8 #include "jni/BlimpClientSession_jni.h" |
| 9 | 9 |
| 10 namespace blimp { | 10 namespace blimp { |
| 11 namespace client { | 11 namespace client { |
| 12 namespace { | 12 namespace { |
| 13 const int kDummyTabId = 0; | 13 const int kDummyTabId = 0; |
| 14 } // namespace | 14 } // namespace |
| 15 | 15 |
| 16 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { | 16 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |
| 17 return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid(env, jobj)); | 17 return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid(env, jobj)); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 43 | 43 |
| 44 BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} | 44 BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} |
| 45 | 45 |
| 46 void BlimpClientSessionAndroid::Destroy(JNIEnv* env, | 46 void BlimpClientSessionAndroid::Destroy(JNIEnv* env, |
| 47 const JavaParamRef<jobject>& jobj) { | 47 const JavaParamRef<jobject>& jobj) { |
| 48 delete this; | 48 delete this; |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace client | 51 } // namespace client |
| 52 } // namespace blimp | 52 } // namespace blimp |
| OLD | NEW |