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

Side by Side Diff: chrome/browser/ui/android/infobars/translate_infobar.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/ui/android/infobars/translate_infobar.h" 5 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 ScopedJavaLocalRef<jstring> source_language_code = 57 ScopedJavaLocalRef<jstring> source_language_code =
58 base::android::ConvertUTF8ToJavaString( 58 base::android::ConvertUTF8ToJavaString(
59 env, delegate->original_language_code()); 59 env, delegate->original_language_code());
60 60
61 ScopedJavaLocalRef<jstring> target_language_code = 61 ScopedJavaLocalRef<jstring> target_language_code =
62 base::android::ConvertUTF8ToJavaString(env, 62 base::android::ConvertUTF8ToJavaString(env,
63 delegate->target_language_code()); 63 delegate->target_language_code());
64 64
65 return Java_TranslateInfoBar_show( 65 return Java_TranslateInfoBar_show(
66 env, delegate->translate_step(), source_language_code.obj(), 66 env, delegate->translate_step(), source_language_code,
67 target_language_code.obj(), delegate->ShouldAlwaysTranslate(), 67 target_language_code, delegate->ShouldAlwaysTranslate(),
68 ShouldDisplayNeverTranslateInfoBarOnCancel(), 68 ShouldDisplayNeverTranslateInfoBarOnCancel(),
69 delegate->triggered_from_menu(), java_languages.obj(), java_codes.obj()); 69 delegate->triggered_from_menu(), java_languages, java_codes);
70 } 70 }
71 71
72 void TranslateInfoBar::ProcessButton(int action) { 72 void TranslateInfoBar::ProcessButton(int action) {
73 if (!owner()) 73 if (!owner())
74 return; // We're closing; don't call anything, it might access the owner. 74 return; // We're closing; don't call anything, it might access the owner.
75 75
76 translate::TranslateInfoBarDelegate* delegate = GetDelegate(); 76 translate::TranslateInfoBarDelegate* delegate = GetDelegate();
77 if (action == InfoBarAndroid::ACTION_TRANSLATE) { 77 if (action == InfoBarAndroid::ACTION_TRANSLATE) {
78 delegate->Translate(); 78 delegate->Translate();
79 return; 79 return;
(...skipping 17 matching lines...) Expand all
97 // Ask the former bar to transfer ownership to us. 97 // Ask the former bar to transfer ownership to us.
98 DCHECK(source != NULL); 98 DCHECK(source != NULL);
99 static_cast<TranslateInfoBar*>(source)->TransferOwnership( 99 static_cast<TranslateInfoBar*>(source)->TransferOwnership(
100 this, delegate->translate_step()); 100 this, delegate->translate_step());
101 } 101 }
102 102
103 void TranslateInfoBar::SetJavaInfoBar( 103 void TranslateInfoBar::SetJavaInfoBar(
104 const base::android::JavaRef<jobject>& java_info_bar) { 104 const base::android::JavaRef<jobject>& java_info_bar) {
105 InfoBarAndroid::SetJavaInfoBar(java_info_bar); 105 InfoBarAndroid::SetJavaInfoBar(java_info_bar);
106 JNIEnv* env = base::android::AttachCurrentThread(); 106 JNIEnv* env = base::android::AttachCurrentThread();
107 Java_TranslateInfoBar_setNativePtr(env, java_info_bar.obj(), 107 Java_TranslateInfoBar_setNativePtr(env, java_info_bar,
108 reinterpret_cast<intptr_t>(this)); 108 reinterpret_cast<intptr_t>(this));
109 } 109 }
110 110
111 void TranslateInfoBar::ApplyTranslateOptions( 111 void TranslateInfoBar::ApplyTranslateOptions(
112 JNIEnv* env, 112 JNIEnv* env,
113 const JavaParamRef<jobject>& obj, 113 const JavaParamRef<jobject>& obj,
114 const JavaParamRef<jstring>& source_language_code, 114 const JavaParamRef<jstring>& source_language_code,
115 const JavaParamRef<jstring>& target_language_code, 115 const JavaParamRef<jstring>& target_language_code,
116 bool always_translate, 116 bool always_translate,
117 bool never_translate_language, 117 bool never_translate_language,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 translate::TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() { 153 translate::TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() {
154 return delegate()->AsTranslateInfoBarDelegate(); 154 return delegate()->AsTranslateInfoBarDelegate();
155 } 155 }
156 156
157 157
158 // Native JNI methods --------------------------------------------------------- 158 // Native JNI methods ---------------------------------------------------------
159 159
160 bool RegisterTranslateInfoBarDelegate(JNIEnv* env) { 160 bool RegisterTranslateInfoBarDelegate(JNIEnv* env) {
161 return RegisterNativesImpl(env); 161 return RegisterNativesImpl(env);
162 } 162 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698