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

Unified Diff: chrome/browser/speech/tts_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/speech/tts_android.cc
diff --git a/chrome/browser/speech/tts_android.cc b/chrome/browser/speech/tts_android.cc
index 18a4e1bed91d4f9e0ddf3042f0299d8fbe01e685..1b558e41274313cf160ad7abd8777c840fd5f96b 100644
--- a/chrome/browser/speech/tts_android.cc
+++ b/chrome/browser/speech/tts_android.cc
@@ -33,7 +33,7 @@ TtsPlatformImplAndroid::TtsPlatformImplAndroid()
TtsPlatformImplAndroid::~TtsPlatformImplAndroid() {
JNIEnv* env = AttachCurrentThread();
- Java_TtsPlatformImpl_destroy(env, java_ref_.obj());
+ Java_TtsPlatformImpl_destroy(env, java_ref_);
}
bool TtsPlatformImplAndroid::PlatformImplAvailable() {
@@ -48,9 +48,9 @@ bool TtsPlatformImplAndroid::Speak(
const UtteranceContinuousParameters& params) {
JNIEnv* env = AttachCurrentThread();
jboolean success = Java_TtsPlatformImpl_speak(
- env, java_ref_.obj(), utterance_id,
- base::android::ConvertUTF8ToJavaString(env, utterance).obj(),
- base::android::ConvertUTF8ToJavaString(env, lang).obj(), params.rate,
+ env, java_ref_, utterance_id,
+ base::android::ConvertUTF8ToJavaString(env, utterance),
+ base::android::ConvertUTF8ToJavaString(env, lang), params.rate,
params.pitch, params.volume);
if (!success)
return false;
@@ -62,7 +62,7 @@ bool TtsPlatformImplAndroid::Speak(
bool TtsPlatformImplAndroid::StopSpeaking() {
JNIEnv* env = AttachCurrentThread();
- Java_TtsPlatformImpl_stop(env, java_ref_.obj());
+ Java_TtsPlatformImpl_stop(env, java_ref_);
utterance_id_ = 0;
utterance_.clear();
return true;
@@ -82,18 +82,18 @@ bool TtsPlatformImplAndroid::IsSpeaking() {
void TtsPlatformImplAndroid::GetVoices(
std::vector<VoiceData>* out_voices) {
JNIEnv* env = AttachCurrentThread();
- if (!Java_TtsPlatformImpl_isInitialized(env, java_ref_.obj()))
+ if (!Java_TtsPlatformImpl_isInitialized(env, java_ref_))
return;
- int count = Java_TtsPlatformImpl_getVoiceCount(env, java_ref_.obj());
+ int count = Java_TtsPlatformImpl_getVoiceCount(env, java_ref_);
for (int i = 0; i < count; ++i) {
out_voices->push_back(VoiceData());
VoiceData& data = out_voices->back();
data.native = true;
data.name = base::android::ConvertJavaStringToUTF8(
- Java_TtsPlatformImpl_getVoiceName(env, java_ref_.obj(), i));
+ Java_TtsPlatformImpl_getVoiceName(env, java_ref_, i));
data.lang = base::android::ConvertJavaStringToUTF8(
- Java_TtsPlatformImpl_getVoiceLanguage(env, java_ref_.obj(), i));
+ Java_TtsPlatformImpl_getVoiceLanguage(env, java_ref_, i));
data.gender = TTS_GENDER_NONE;
data.events.insert(TTS_EVENT_START);
data.events.insert(TTS_EVENT_END);

Powered by Google App Engine
This is Rietveld 408576698