| Index: blimp/client/app/android/blimp_client_session_android.cc
|
| diff --git a/blimp/client/app/android/blimp_client_session_android.cc b/blimp/client/app/android/blimp_client_session_android.cc
|
| index 2e3ffad191c2f4a03a0a9448f7332b3b58650632..eebfe7b20a797ea9ec79e170fbbda699bd475a39 100644
|
| --- a/blimp/client/app/android/blimp_client_session_android.cc
|
| +++ b/blimp/client/app/android/blimp_client_session_android.cc
|
| @@ -19,8 +19,6 @@
|
| #include "net/base/net_errors.h"
|
| #include "ui/android/window_android.h"
|
|
|
| -using base::android::JavaParamRef;
|
| -
|
| namespace blimp {
|
| namespace client {
|
| namespace {
|
| @@ -35,7 +33,7 @@ GURL CreateAssignerGURL(const std::string& assigner_url) {
|
| } // namespace
|
|
|
| static jlong Init(JNIEnv* env,
|
| - const JavaParamRef<jobject>& jobj,
|
| + const base::android::JavaParamRef<jobject>& jobj,
|
| const base::android::JavaParamRef<jstring>& jassigner_url,
|
| jlong window_android_ptr) {
|
| return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid(
|
| @@ -107,8 +105,9 @@ void BlimpClientSessionAndroid::OnDisconnected(int result) {
|
| env, net::ErrorToShortString(result)));
|
| }
|
|
|
| -void BlimpClientSessionAndroid::Destroy(JNIEnv* env,
|
| - const JavaParamRef<jobject>& jobj) {
|
| +void BlimpClientSessionAndroid::Destroy(
|
| + JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& jobj) {
|
| delete this;
|
| }
|
|
|
|
|