From 3b1c18191d41eac0a551b3009269a259757ca070 Mon Sep 17 00:00:00 2001 From: "jcampan@chromium.org" Date: Fri, 12 Feb 2010 21:53:55 +0000 Subject: Implements the auto-translate on click: if you have translated a page and are navigating to a new page in the same language by clicking a link, the new page is automatically translated. In order to do that I moved the language state from the navigation entry to some dedicated class that each TabContents owns. Also added some basic unit-testing for good measure. BUG=35477 TEST=See bug steps. Run unit-tests. Review URL: http://codereview.chromium.org/596092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38961 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_browsertest.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'chrome/browser/browser_browsertest.cc') diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index fcd063d..edce8e0 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -457,20 +457,16 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { // Navigate to a page in English. ui_test_utils::NavigateToURL( browser(), GURL(server->TestServerPage("files/english_page.html"))); - NavigationEntry* entry = current_tab->controller().GetActiveEntry(); - ASSERT_TRUE(NULL != entry); - EXPECT_TRUE(entry->language().empty()); + EXPECT_TRUE(current_tab->language_state().original_language().empty()); std::string lang = ui_test_utils::WaitForLanguageDetection(current_tab); EXPECT_EQ("en", lang); - EXPECT_EQ("en", entry->language()); + EXPECT_EQ("en", current_tab->language_state().original_language()); // Now navigate to a page in French. ui_test_utils::NavigateToURL( browser(), GURL(server->TestServerPage("files/french_page.html"))); - entry = current_tab->controller().GetActiveEntry(); - ASSERT_TRUE(NULL != entry); - EXPECT_TRUE(entry->language().empty()); + EXPECT_TRUE(current_tab->language_state().original_language().empty()); lang = ui_test_utils::WaitForLanguageDetection(current_tab); EXPECT_EQ("fr", lang); - EXPECT_EQ("fr", entry->language()); + EXPECT_EQ("fr", current_tab->language_state().original_language()); } -- cgit v1.1