Introduces snackbar enum, & other snackbar classes on android for translate

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"
 #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/ui/android/snackbars/translate_snackbar.h"
 #include "components/translate/core/browser/translate_infobar_delegate.h"
 #include "jni/TranslateCompactInfoBar_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 // TranslateInfoBar -----------------------------------------------------------
 
 TranslateCompactInfoBar::TranslateCompactInfoBar(
     std::unique_ptr<translate::TranslateInfoBarDelegate> delegate)
     : InfoBarAndroid(std::move(delegate)) {
   // |translate_driver| must already be bound.
   DCHECK(GetDelegate()->GetTranslateDriver());
   translate_driver_ = static_cast<translate::ContentTranslateDriver*>(
       GetDelegate()->GetTranslateDriver());
   translate_driver_->AddObserver(this);
+  snackbar_type = TranslateUtils::TYPE_NONE;
 }
 
 TranslateCompactInfoBar::~TranslateCompactInfoBar() {
   DCHECK(translate_driver_);
   translate_driver_->RemoveObserver(this);
 }
 
 ScopedJavaLocalRef<jobject> TranslateCompactInfoBar::CreateRenderInfoBar(
     JNIEnv* env) {
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
@@ skipping 30 matching lines @@
 }
 
 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,
                                             reinterpret_cast<intptr_t>(this));
 }
 
+void TranslateCompactInfoBar::CloseJavaInfoBar() {
+  if (GetJavaInfoBar() != nullptr) {
+    JNIEnv* env = base::android::AttachCurrentThread();

[gone, 2017/04/26 17:19:51]

I'd make the Java side closeInfoBarInternal call into native when it gets called
to create your TranslateSnackbar.  Extra JNI hop, but it avoids divergence.

[ramyasharma, 2017/04/27 08:01:42]

Thanks. Not using this approach anymore.

+    TranslateSnackbar* snackbar = new TranslateSnackbar(snackbar_type);
+    Java_TranslateCompactInfoBar_closeInfoBar(
+        env, GetJavaInfoBar(), snackbar_type,
+        reinterpret_cast<intptr_t>(snackbar));
+  }
+}
+
 void TranslateCompactInfoBar::ApplyStringTranslateOption(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     int option,
     const JavaParamRef<jstring>& value) {
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
   if (option == TranslateUtils::OPTION_SOURCE_CODE) {
     std::string source_code =
         base::android::ConvertJavaStringToUTF8(env, value);
     if (delegate->original_language_code().compare(source_code) != 0)
       delegate->UpdateOriginalLanguage(source_code);
   } else if (option == TranslateUtils::OPTION_TARGET_CODE) {
     std::string target_code =
         base::android::ConvertJavaStringToUTF8(env, value);
     if (delegate->target_language_code().compare(target_code) != 0)
       delegate->UpdateTargetLanguage(target_code);
   } else {
     DCHECK(false);
   }
 }
 
 void TranslateCompactInfoBar::ApplyBoolTranslateOption(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     int option,
     jboolean value) {
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
   if (option == TranslateUtils::OPTION_ALWAYS_TRANSLATE) {
-    if (delegate->ShouldAlwaysTranslate() != value)
+    if (delegate->ShouldAlwaysTranslate() != value) {
       delegate->ToggleAlwaysTranslate();
+      snackbar_type = TranslateUtils::TYPE_ALWAYS_TRANSLATE;
+      TranslateCompactInfoBar::CloseJavaInfoBar();

[gone, 2017/04/26 17:19:51]

You shouldn't need to scope TranslateCompactInfoBar.  You're already in it.

[ramyasharma, 2017/04/27 08:01:42]

Done.

+    }
   } else if (option == TranslateUtils::OPTION_NEVER_TRANSLATE) {
-    if (value && delegate->IsTranslatableLanguageByPrefs())
+    if (value && delegate->IsTranslatableLanguageByPrefs()) {
       delegate->ToggleTranslatableLanguageByPrefs();
+      snackbar_type = TranslateUtils::TYPE_NEVER_TRANSLATE;
+      TranslateCompactInfoBar::CloseJavaInfoBar();
+    }
   } else if (option == TranslateUtils::OPTION_NEVER_TRANSLATE_SITE) {
-    if (value && !delegate->IsSiteBlacklisted())
+    if (value && !delegate->IsSiteBlacklisted()) {
       delegate->ToggleSiteBlacklist();
+      snackbar_type = TranslateUtils::TYPE_NEVER_TRANSLATE_SITE;
+      TranslateCompactInfoBar::CloseJavaInfoBar();
+    }
   } else {
     DCHECK(false);
   }
 }
 
 void TranslateCompactInfoBar::OnPageTranslated(
     const std::string& original_lang,
     const std::string& translated_lang,
     translate::TranslateErrors::Type error_type) {
   if (!owner())
     return;  // We're closing; don't call anything, it might access the owner.
 
   DCHECK(translate_driver_);
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_TranslateCompactInfoBar_onPageTranslated(env, GetJavaInfoBar(),
                                                 error_type);
 }
 
 translate::TranslateInfoBarDelegate* TranslateCompactInfoBar::GetDelegate() {
   return delegate()->AsTranslateInfoBarDelegate();
 }
 
 // Native JNI methods ---------------------------------------------------------
 
 // static
 bool RegisterTranslateCompactInfoBar(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }