| Index: chrome/browser/ui/android/infobars/translate_compact_infobar.cc
|
| diff --git a/chrome/browser/ui/android/infobars/translate_compact_infobar.cc b/chrome/browser/ui/android/infobars/translate_compact_infobar.cc
|
| index 7ad3a457bcea2c96762370b094e92bf7c54da110..a7cafe9ecc8c8f8f166f131c5552078376f4892f 100644
|
| --- a/chrome/browser/ui/android/infobars/translate_compact_infobar.cc
|
| +++ b/chrome/browser/ui/android/infobars/translate_compact_infobar.cc
|
| @@ -68,8 +68,7 @@ void TranslateCompactInfoBar::ProcessButton(int action) {
|
| translate::TranslateInfoBarDelegate* delegate = GetDelegate();
|
| if (action == InfoBarAndroid::ACTION_TRANSLATE) {
|
| delegate->Translate();
|
| - if (!delegate->ShouldAlwaysTranslate() &&
|
| - delegate->ShouldAutoAlwaysTranslate()) {
|
| + if (!delegate->ShouldAlwaysTranslate() && ShouldAutoAlwaysTranslate()) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| Java_TranslateCompactInfoBar_setAutoAlwaysTranslate(env,
|
| GetJavaInfoBar());
|
| @@ -150,7 +149,14 @@ void TranslateCompactInfoBar::OnPageTranslated(
|
|
|
| bool TranslateCompactInfoBar::ShouldAutoAlwaysTranslate() {
|
| translate::TranslateInfoBarDelegate* delegate = GetDelegate();
|
| - return delegate->ShouldAutoAlwaysTranslate();
|
| + return (delegate->GetTranslationAcceptedCount() == kAcceptCountThreshold);
|
| +}
|
| +
|
| +jboolean TranslateCompactInfoBar::ShouldAutoNeverTranslate(
|
| + JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& obj) {
|
| + translate::TranslateInfoBarDelegate* delegate = GetDelegate();
|
| + return (delegate->GetTranslationDeniedCount() == kDeniedCountThreshold);
|
| }
|
|
|
| translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() {
|
|
|