Chromium Code Reviews| 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..393fe36db14b61e016aa2a75b30c0ad88d8620c8 100644 |
| --- a/chrome/browser/ui/android/infobars/translate_infobar.cc |
| +++ b/chrome/browser/ui/android/infobars/translate_infobar.cc |
| @@ -14,8 +14,9 @@ |
| #include "base/android/jni_weak_ref.h" |
| #include "base/memory/ptr_util.h" |
| #include "chrome/browser/translate/chrome_translate_client.h" |
| +#include "chrome/browser/ui/android/infobars/translate_compact_infobar.h" |
| +#include "chrome/browser/ui/android/infobars/translate_utils.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,37 +45,22 @@ 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( |
| - env, delegate->original_language_code()); |
| + TranslateUtils::GetLanguageCode(env, delegate->original_language_code()); |
|
gone
2017/03/24 20:34:30
Why does this need to be pulled out? It's a singl
ramyasharma
2017/03/27 03:36:59
Done.
|
| ScopedJavaLocalRef<jstring> target_language_code = |
| - 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); |
| - } |
| + TranslateUtils::GetLanguageCode(env, delegate->target_language_code()); |
| + |
| + 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 +98,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( |