Index: chrome/browser/ui/android/infobars/translate_infobar.cc |
diff --git a/chrome/browser/ui/android/infobars/translate_infobar.cc b/chrome/browser/ui/android/infobars/translate_infobar.cc |
index 0ba82095359b813f77301cdea6884ece45cc4c71..2f393dd8e7623ad36eae5de23529d2e58d590b84 100644 |
--- a/chrome/browser/ui/android/infobars/translate_infobar.cc |
+++ b/chrome/browser/ui/android/infobars/translate_infobar.cc |
@@ -13,9 +13,10 @@ |
#include "base/android/jni_string.h" |
#include "base/android/jni_weak_ref.h" |
#include "base/memory/ptr_util.h" |
+#include "chrome/browser/translate/android/translate_utils.h" |
#include "chrome/browser/translate/chrome_translate_client.h" |
+#include "chrome/browser/ui/android/infobars/translate_compact_infobar.h" |
#include "components/translate/core/browser/translate_infobar_delegate.h" |
-#include "jni/TranslateCompactInfoBar_jni.h" |
#include "jni/TranslateInfoBar_jni.h" |
using base::android::JavaParamRef; |
@@ -26,7 +27,10 @@ using base::android::ScopedJavaLocalRef; |
std::unique_ptr<infobars::InfoBar> ChromeTranslateClient::CreateInfoBar( |
std::unique_ptr<translate::TranslateInfoBarDelegate> delegate) const { |
- return base::MakeUnique<TranslateInfoBar>(std::move(delegate)); |
+ if (translate::TranslateInfoBarDelegate::IsCompactUIEnabled()) |
+ return base::MakeUnique<TranslateCompactInfoBar>(std::move(delegate)); |
+ else |
+ return base::MakeUnique<TranslateInfoBar>(std::move(delegate)); |
} |
@@ -41,19 +45,10 @@ TranslateInfoBar::~TranslateInfoBar() { |
ScopedJavaLocalRef<jobject> TranslateInfoBar::CreateRenderInfoBar(JNIEnv* env) { |
translate::TranslateInfoBarDelegate* delegate = GetDelegate(); |
- std::vector<base::string16> languages; |
- std::vector<std::string> codes; |
- languages.reserve(delegate->num_languages()); |
- codes.reserve(delegate->num_languages()); |
- for (size_t i = 0; i < delegate->num_languages(); ++i) { |
- languages.push_back(delegate->language_name_at(i)); |
- codes.push_back(delegate->language_code_at(i)); |
- } |
- DCHECK(codes.size() == languages.size()); |
base::android::ScopedJavaLocalRef<jobjectArray> java_languages = |
- base::android::ToJavaArrayOfStrings(env, languages); |
+ TranslateUtils::GetJavaLanguages(env, delegate); |
base::android::ScopedJavaLocalRef<jobjectArray> java_codes = |
- base::android::ToJavaArrayOfStrings(env, codes); |
+ TranslateUtils::GetJavaLanguageCodes(env, delegate); |
ScopedJavaLocalRef<jstring> source_language_code = |
base::android::ConvertUTF8ToJavaString( |
@@ -63,15 +58,11 @@ ScopedJavaLocalRef<jobject> TranslateInfoBar::CreateRenderInfoBar(JNIEnv* env) { |
base::android::ConvertUTF8ToJavaString(env, |
delegate->target_language_code()); |
- if (translate::TranslateInfoBarDelegate::IsCompactUIEnabled()) { |
- return Java_TranslateCompactInfoBar_create(env); |
- } else { |
- return Java_TranslateInfoBar_show( |
- env, delegate->translate_step(), source_language_code, |
- target_language_code, delegate->ShouldAlwaysTranslate(), |
- ShouldDisplayNeverTranslateInfoBarOnCancel(), |
- delegate->triggered_from_menu(), java_languages, java_codes); |
- } |
+ return Java_TranslateInfoBar_show( |
+ env, delegate->translate_step(), source_language_code, |
+ target_language_code, delegate->ShouldAlwaysTranslate(), |
+ ShouldDisplayNeverTranslateInfoBarOnCancel(), |
+ delegate->triggered_from_menu(), java_languages, java_codes); |
} |
void TranslateInfoBar::ProcessButton(int action) { |
@@ -109,13 +100,8 @@ void TranslateInfoBar::SetJavaInfoBar( |
const base::android::JavaRef<jobject>& java_info_bar) { |
InfoBarAndroid::SetJavaInfoBar(java_info_bar); |
JNIEnv* env = base::android::AttachCurrentThread(); |
- if (translate::TranslateInfoBarDelegate::IsCompactUIEnabled()) { |
- Java_TranslateCompactInfoBar_setNativePtr(env, java_info_bar, |
- reinterpret_cast<intptr_t>(this)); |
- } else { |
Java_TranslateInfoBar_setNativePtr(env, java_info_bar, |
reinterpret_cast<intptr_t>(this)); |
- } |
} |
void TranslateInfoBar::ApplyTranslateOptions( |