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: base/android/jni_generator/sample_for_tests.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
« no previous file with comments | « base/android/java_runtime.cc ('k') | base/message_loop/message_pump_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <iostream> 5 #include <iostream>
6 6
7 #include "base/android/jni_generator/sample_for_tests.h" 7 #include "base/android/jni_generator/sample_for_tests.h"
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 } 44 }
45 45
46 jint CPPClass::Method(JNIEnv* env, const JavaParamRef<jobject>& caller) { 46 jint CPPClass::Method(JNIEnv* env, const JavaParamRef<jobject>& caller) {
47 return 0; 47 return 0;
48 } 48 }
49 49
50 void CPPClass::AddStructB(JNIEnv* env, 50 void CPPClass::AddStructB(JNIEnv* env,
51 const JavaParamRef<jobject>& caller, 51 const JavaParamRef<jobject>& caller,
52 const JavaParamRef<jobject>& structb) { 52 const JavaParamRef<jobject>& structb) {
53 long key = Java_InnerStructB_getKey(env, structb); 53 long key = Java_InnerStructB_getKey(env, structb);
54 std::string value = ConvertJavaStringToUTF8( 54 std::string value =
55 env, Java_InnerStructB_getValue(env, structb).obj()); 55 ConvertJavaStringToUTF8(env, Java_InnerStructB_getValue(env, structb));
56 map_[key] = value; 56 map_[key] = value;
57 } 57 }
58 58
59 void CPPClass::IterateAndDoSomethingWithStructB( 59 void CPPClass::IterateAndDoSomethingWithStructB(
60 JNIEnv* env, 60 JNIEnv* env,
61 const JavaParamRef<jobject>& caller) { 61 const JavaParamRef<jobject>& caller) {
62 // Iterate over the elements and do something with them. 62 // Iterate over the elements and do something with them.
63 for (std::map<long, std::string>::const_iterator it = map_.begin(); 63 for (std::map<long, std::string>::const_iterator it = map_.begin();
64 it != map_.end(); ++it) { 64 it != map_.end(); ++it) {
65 long key = it->first; 65 long key = it->first;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 jobject my_java_object = NULL; 120 jobject my_java_object = NULL;
121 int bar = base::android::Java_SampleForTests_javaMethod( 121 int bar = base::android::Java_SampleForTests_javaMethod(
122 env, my_java_object, 1, 2); 122 env, my_java_object, 1, 2);
123 123
124 std::cout << foo << bar; 124 std::cout << foo << bar;
125 125
126 for (int i = 0; i < 10; ++i) { 126 for (int i = 0; i < 10; ++i) {
127 // Creates a "struct" that will then be used by the java side. 127 // Creates a "struct" that will then be used by the java side.
128 ScopedJavaLocalRef<jobject> struct_a = 128 ScopedJavaLocalRef<jobject> struct_a =
129 base::android::Java_InnerStructA_create( 129 base::android::Java_InnerStructA_create(
130 env, 0, 1, ConvertUTF8ToJavaString(env, "test").obj()); 130 env, 0, 1, ConvertUTF8ToJavaString(env, "test"));
131 base::android::Java_SampleForTests_addStructA( 131 base::android::Java_SampleForTests_addStructA(env, my_java_object,
132 env, my_java_object, struct_a.obj()); 132 struct_a);
133 } 133 }
134 base::android::Java_SampleForTests_iterateAndDoSomething(env, my_java_object); 134 base::android::Java_SampleForTests_iterateAndDoSomething(env, my_java_object);
135 base::android::Java_SampleForTests_packagePrivateJavaMethod(env, 135 base::android::Java_SampleForTests_packagePrivateJavaMethod(env,
136 my_java_object); 136 my_java_object);
137 base::android::Java_SampleForTests_methodThatThrowsException(env, 137 base::android::Java_SampleForTests_methodThatThrowsException(env,
138 my_java_object); 138 my_java_object);
139 return 0; 139 return 0;
140 } 140 }
OLDNEW
« no previous file with comments | « base/android/java_runtime.cc ('k') | base/message_loop/message_pump_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698