Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: blimp/client/core/android/blimp_client_context_impl_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 : BlimpClientContextImpl(io_thread_task_runner, file_thread_task_runner) { 45 : BlimpClientContextImpl(io_thread_task_runner, file_thread_task_runner) {
46 JNIEnv* env = base::android::AttachCurrentThread(); 46 JNIEnv* env = base::android::AttachCurrentThread();
47 47
48 java_obj_.Reset(env, Java_BlimpClientContextImpl_create( 48 java_obj_.Reset(env, Java_BlimpClientContextImpl_create(
49 env, reinterpret_cast<intptr_t>(this)) 49 env, reinterpret_cast<intptr_t>(this))
50 .obj()); 50 .obj());
51 } 51 }
52 52
53 BlimpClientContextImplAndroid::~BlimpClientContextImplAndroid() { 53 BlimpClientContextImplAndroid::~BlimpClientContextImplAndroid() {
54 Java_BlimpClientContextImpl_clearNativePtr( 54 Java_BlimpClientContextImpl_clearNativePtr(
55 base::android::AttachCurrentThread(), java_obj_.obj()); 55 base::android::AttachCurrentThread(), java_obj_);
56 } 56 }
57 57
58 base::android::ScopedJavaLocalRef<jobject> 58 base::android::ScopedJavaLocalRef<jobject>
59 BlimpClientContextImplAndroid::GetJavaObject() { 59 BlimpClientContextImplAndroid::GetJavaObject() {
60 return base::android::ScopedJavaLocalRef<jobject>(java_obj_); 60 return base::android::ScopedJavaLocalRef<jobject>(java_obj_);
61 } 61 }
62 62
63 base::android::ScopedJavaLocalRef<jobject> 63 base::android::ScopedJavaLocalRef<jobject>
64 BlimpClientContextImplAndroid::CreateBlimpContentsJava(JNIEnv* env, 64 BlimpClientContextImplAndroid::CreateBlimpContentsJava(JNIEnv* env,
65 jobject jobj) { 65 jobject jobj) {
66 std::unique_ptr<BlimpContents> blimp_contents = 66 std::unique_ptr<BlimpContents> blimp_contents =
67 BlimpClientContextImpl::CreateBlimpContents(); 67 BlimpClientContextImpl::CreateBlimpContents();
68 // This intentionally releases the ownership and gives it to Java. 68 // This intentionally releases the ownership and gives it to Java.
69 BlimpContentsImpl* blimp_contents_impl = 69 BlimpContentsImpl* blimp_contents_impl =
70 static_cast<BlimpContentsImpl*>(blimp_contents.release()); 70 static_cast<BlimpContentsImpl*>(blimp_contents.release());
71 return blimp_contents_impl->GetJavaBlimpContentsImpl(); 71 return blimp_contents_impl->GetJavaBlimpContentsImpl();
72 } 72 }
73 73
74 GURL BlimpClientContextImplAndroid::GetAssignerURL() { 74 GURL BlimpClientContextImplAndroid::GetAssignerURL() {
75 JNIEnv* env = base::android::AttachCurrentThread(); 75 JNIEnv* env = base::android::AttachCurrentThread();
76 base::android::ScopedJavaLocalRef<jstring> jurl = 76 base::android::ScopedJavaLocalRef<jstring> jurl =
77 Java_BlimpClientContextImpl_getAssignerUrl(env, java_obj_.obj()); 77 Java_BlimpClientContextImpl_getAssignerUrl(env, java_obj_);
78 GURL assigner_url = GURL(ConvertJavaStringToUTF8(env, jurl)); 78 GURL assigner_url = GURL(ConvertJavaStringToUTF8(env, jurl));
79 DCHECK(assigner_url.is_valid()); 79 DCHECK(assigner_url.is_valid());
80 return assigner_url; 80 return assigner_url;
81 } 81 }
82 82
83 } // namespace client 83 } // namespace client
84 } // namespace blimp 84 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/client/app/android/web_input_box.cc ('k') | blimp/client/core/android/dummy_blimp_client_context_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698