Sites like Google Maps may trigger navigations when the user interacts with the page.

In such cases, we shouldn't show a new translate infobar offering to translate the page if the user already declined translation on that page.

BUG=48215
TEST=See bug for URL and steps.

Review URL: http://codereview.chromium.org/3183001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56072 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 35 insertions, 1 deletions

diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 23bfc2f..64d029e 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -187,6 +187,13 @@ void TranslateManager::Observe(NotificationType type,
         NOTREACHED();
         return;
       }
+      if (!load_details->is_main_frame &&
+          controller->tab_contents()->language_state().translation_declined()) {
+        // Some sites (such as Google map) may trigger sub-frame navigations
+        // when the user interacts with the page.  We don't want to show a new
+        // infobar if the user already dismissed one in that case.
+        return;
+      }
       if (entry->transition_type() != PageTransition::RELOAD &&
           load_details->type != NavigationType::SAME_PAGE) {
         return;
diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc
index 302aae01..08a2994 100644
--- a/chrome/browser/translate/translate_manager_unittest.cc
+++ b/chrome/browser/translate/translate_manager_unittest.cc
@@ -618,7 +618,7 @@ TEST_F(TranslateManagerTest, ReloadFromLocationBar) {
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
-// Tests that a close translate infobar does not reappear when navigating
+// Tests that a closed translate infobar does not reappear when navigating
 // in-page.
 TEST_F(TranslateManagerTest, CloseInfoBarInPageNavigation) {
   // Simulate navigating to a page and getting its language.
@@ -638,6 +638,33 @@ TEST_F(TranslateManagerTest, CloseInfoBarInPageNavigation) {
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
+// Tests that a closed translate infobar does not reappear when navigating
+// in a subframe. (http://crbug.com/48215)
+TEST_F(TranslateManagerTest, CloseInfoBarInSubframeNavigation) {
+  // Simulate navigating to a page and getting its language.
+  SimulateNavigation(GURL("http://www.google.fr"), 0, "Le Google", "fr", true);
+
+  // Close the infobar.
+  EXPECT_TRUE(CloseTranslateInfoBar());
+
+  // Simulate a sub-frame auto-navigating.
+  rvh()->SendNavigateWithTransition(1, GURL("http://pub.com"),
+                                    PageTransition::AUTO_SUBFRAME);
+  EXPECT_TRUE(GetTranslateInfoBar() == NULL);
+
+  // Simulate the user navigating in a sub-frame.
+  rvh()->SendNavigateWithTransition(2, GURL("http://pub.com"),
+                                    PageTransition::MANUAL_SUBFRAME);
+  EXPECT_TRUE(GetTranslateInfoBar() == NULL);
+
+  // Navigate out of page, a new infobar should show.
+  SimulateNavigation(GURL("http://www.google.fr/foot"), 3, "Le Google", "fr",
+                     true);
+  EXPECT_TRUE(GetTranslateInfoBar() != NULL);
+}
+
+
+
 // Tests that denying translation is sticky when navigating in page.
 TEST_F(TranslateManagerTest, DenyTranslateInPageNavigation) {
   // Simulate navigating to a page and getting its language.