Code cleanup for Translate Compact Infobar.

chrome/browser/ui/android/infobars/translate_compact_infobar.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/infobars/translate_compact_infobar.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 54 matching lines @@
     action_flags_ |= FLAG_TRANSLATE;
     delegate->Translate();
     if (!delegate->ShouldAlwaysTranslate() && ShouldAutoAlwaysTranslate()) {
       JNIEnv* env = base::android::AttachCurrentThread();
       Java_TranslateCompactInfoBar_setAutoAlwaysTranslate(env,
                                                           GetJavaInfoBar());
     }
   } else if (action == InfoBarAndroid::ACTION_TRANSLATE_SHOW_ORIGINAL) {
     action_flags_ |= FLAG_REVERT;
     delegate->RevertWithoutClosingInfobar();
-  } else if (action == InfoBarAndroid::ACTION_CANCEL) {
-    delegate->TranslationDeclined();
   } else {
     DCHECK_EQ(InfoBarAndroid::ACTION_NONE, action);
   }
 }
 
 void TranslateCompactInfoBar::SetJavaInfoBar(
     const base::android::JavaRef<jobject>& java_info_bar) {
   InfoBarAndroid::SetJavaInfoBar(java_info_bar);
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_TranslateCompactInfoBar_setNativePtr(env, java_info_bar,
@@ skipping 47 matching lines @@
   }
 }
 
 bool TranslateCompactInfoBar::ShouldAutoAlwaysTranslate() {
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
   return (delegate->GetTranslationAcceptedCount() == kAcceptCountThreshold);
 }
 
 jboolean TranslateCompactInfoBar::ShouldAutoNeverTranslate(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& obj) {
+    const base::android::JavaParamRef<jobject>& obj,
+    jboolean menu_expanded) {
+  // Mark menu expanded.
+  if (menu_expanded)
+    action_flags_ |= FLAG_EXPAND_MENU;
+
+  if (!IsDeclinedByUser())
+    return false;
+
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
+  // Don't trigger if it's off the recored or already blocked.

[Marti Wong, 2017/05/23 08:23:32]

typo: record

[Leo, 2017/05/23 14:33:01]

Thanks for the catch.

+  if (delegate->is_off_the_record() ||
+      !delegate->IsTranslatableLanguageByPrefs())
+    return false;
+
   return (delegate->GetTranslationDeniedCount() == kDeniedCountThreshold);
 }
 
 translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() {
   return delegate()->AsTranslateInfoBarDelegate();
 }
 
 void TranslateCompactInfoBar::OnTranslateStepChanged(
     translate::TranslateStep step,
     translate::TranslateErrors::Type error_type) {
   if (!owner())
     return;  // We're closing; don't call anything.
 
   if ((step == translate::TRANSLATE_STEP_AFTER_TRANSLATE) ||
       (step == translate::TRANSLATE_STEP_TRANSLATE_ERROR)) {
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_TranslateCompactInfoBar_onPageTranslated(env, GetJavaInfoBar(),
                                                   error_type);
   }
 }
 
 bool TranslateCompactInfoBar::IsDeclinedByUser() {
   return action_flags_ == FLAG_NONE;

[Marti Wong, 2017/05/23 08:23:32]

If user clicks on CLOSE after a auto translate (without menu expanded), is the
action_flags == FLAG_NONE?

So translate_ui_delegate#TranslationDeclined() (which will increment
translationDeniedCount) is called when
TranslateInfoBarDelegate::InfoBarDismissed() and IsDeclinedByUser is TRUE?

It seems quite tricky may be we should add comment here to explain this
scenario.

[Leo, 2017/05/23 14:33:01]

Added more explanation in where it's defined.

 };
 
 // Native JNI methods ---------------------------------------------------------
 
 // static
 bool RegisterTranslateCompactInfoBar(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }