[Translate] Do not show TRANSLATING and AFTER_TRANSLATE when on a translate session

chrome/browser/translate/translate_infobar_delegate.cc

 // Copyright (c) 2012 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/translate/translate_infobar_delegate.h"
 
 #include <algorithm>
 
 #include "base/i18n/string_compare.h"
 #include "base/metrics/histogram.h"
@@ skipping 56 matching lines @@
       break;
   }
 
   // Create the new delegate.
   scoped_ptr<TranslateInfoBarDelegate> infobar(
       new TranslateInfoBarDelegate(infobar_type, error_type, infobar_service,
                                    prefs, shortcut_config,
                                    original_language, target_language));
   infobar->UpdateBackgroundAnimation(old_delegate);
 
+  // Do not create the after translate infobar if we are auto translating.
+  if (infobar_type == TranslateInfoBarDelegate::AFTER_TRANSLATE

[Takashi Toyoshima, 2013/06/21 12:19:53]

In chromium style, "||" should be the end of previous line if it can not fit
single-line
e.g.,
if (foo ||
    bar)

[Miguel Garcia, 2013/06/21 13:24:59]

Done.

+      || infobar_type == TranslateInfoBarDelegate::TRANSLATING) {
+    TranslateTabHelper* translate_tab_helper =
+      TranslateTabHelper::FromWebContents(infobar_service->web_contents());
+    if (!translate_tab_helper
+         || translate_tab_helper->language_state().InTranslateNavigation())
+      return;
+  }
+
   // Add the new delegate if necessary.
   if (!old_delegate) {
     infobar_service->AddInfoBar(infobar.PassAs<InfoBarDelegate>());
   } else if (replace_existing_infobar) {
     infobar_service->ReplaceInfoBar(old_delegate,
                                     infobar.PassAs<InfoBarDelegate>());
   }
 }
 
 void TranslateInfoBarDelegate::Translate() {
@@ skipping 32 matching lines @@
   // translations when getting a LANGUAGE_DETERMINED from the page, which
   // happens when a load stops. That could happen multiple times, including
   // after the user already declined the translation.)
   TranslateTabHelper* translate_tab_helper =
       TranslateTabHelper::FromWebContents(web_contents());
   translate_tab_helper->language_state().set_translation_declined(true);
 
   UMA_HISTOGRAM_BOOLEAN(kDeclineTranslate, true);
 }
 
-bool TranslateInfoBarDelegate::InTranslateNavigation() {
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(web_contents());
-  if (!translate_tab_helper)
-    return false;
-  return translate_tab_helper->language_state().InTranslateNavigation();
-}
-
 bool TranslateInfoBarDelegate::IsTranslatableLanguageByPrefs() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   Profile* original_profile = profile->GetOriginalProfile();
   return TranslatePrefs::CanTranslateLanguage(original_profile,
                                               original_language_code());
 }
 
 void TranslateInfoBarDelegate::ToggleTranslatableLanguageByPrefs() {
   const std::string& original_lang = original_language_code();
@@ skipping 265 matching lines @@
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
 
 std::string TranslateInfoBarDelegate::GetPageHost() {
   NavigationEntry* entry = web_contents()->GetController().GetActiveEntry();
   return entry ? entry->GetURL().HostNoBrackets() : std::string();
 }