Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(776)

Side by Side Diff: chrome/browser/translate/translate_manager_browsertest.cc

Issue 133273029: Move LanguageState to the translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more compile issues Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 #include <set> 6 #include <set>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 TranslateBubbleModel::ViewState view_state, 346 TranslateBubbleModel::ViewState view_state,
347 TranslateErrors::Type error_type) OVERRIDE { 347 TranslateErrors::Type error_type) OVERRIDE {
348 if (model_) { 348 if (model_) {
349 model_->SetViewState(view_state); 349 model_->SetViewState(view_state);
350 return; 350 return;
351 } 351 }
352 352
353 TranslateTabHelper* translate_tab_helper = 353 TranslateTabHelper* translate_tab_helper =
354 TranslateTabHelper::FromWebContents(web_contents); 354 TranslateTabHelper::FromWebContents(web_contents);
355 std::string source_language = 355 std::string source_language =
356 translate_tab_helper->language_state().original_language(); 356 translate_tab_helper->GetLanguageState().original_language();
357 std::string target_language = TranslateManager::GetLanguageCode( 357 std::string target_language = TranslateManager::GetLanguageCode(
358 g_browser_process->GetApplicationLocale()); 358 g_browser_process->GetApplicationLocale());
359 scoped_ptr<TranslateUIDelegate> ui_delegate( 359 scoped_ptr<TranslateUIDelegate> ui_delegate(
360 new TranslateUIDelegate(web_contents, 360 new TranslateUIDelegate(web_contents,
361 source_language, 361 source_language,
362 target_language)); 362 target_language));
363 model_.reset( 363 model_.reset(
364 new TranslateBubbleModelImpl(view_state, ui_delegate.Pass())); 364 new TranslateBubbleModelImpl(view_state, ui_delegate.Pass()));
365 } 365 }
366 366
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1597 source); 1597 source);
1598 1598
1599 GURL french_url = ui_test_utils::GetTestUrl( 1599 GURL french_url = ui_test_utils::GetTestUrl(
1600 base::FilePath(), base::FilePath(FILE_PATH_LITERAL("french_page.html"))); 1600 base::FilePath(), base::FilePath(FILE_PATH_LITERAL("french_page.html")));
1601 ui_test_utils::NavigateToURL(browser(), french_url); 1601 ui_test_utils::NavigateToURL(browser(), french_url);
1602 fr_language_detected_signal.Wait(); 1602 fr_language_detected_signal.Wait();
1603 LanguageDetectionDetails details; 1603 LanguageDetectionDetails details;
1604 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor( 1604 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor(
1605 source.map_key(), &details)); 1605 source.map_key(), &details));
1606 EXPECT_EQ("fr", details.adopted_language); 1606 EXPECT_EQ("fr", details.adopted_language);
1607 EXPECT_EQ("fr", translate_tab_helper->language_state().original_language()); 1607 EXPECT_EQ("fr", translate_tab_helper->GetLanguageState().original_language());
1608 } 1608 }
1609 1609
1610 #if defined (OS_WIN) 1610 #if defined (OS_WIN)
1611 #define MAYBE_TranslateSessionRestore DISABLED_TranslateSessionRestore 1611 #define MAYBE_TranslateSessionRestore DISABLED_TranslateSessionRestore
1612 #else 1612 #else
1613 #define MAYBE_TranslateSessionRestore TranslateSessionRestore 1613 #define MAYBE_TranslateSessionRestore TranslateSessionRestore
1614 #endif 1614 #endif
1615 IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, MAYBE_TranslateSessionRestore) { 1615 IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, MAYBE_TranslateSessionRestore) {
1616 content::WebContents* current_web_contents = 1616 content::WebContents* current_web_contents =
1617 browser()->tab_strip_model()->GetActiveWebContents(); 1617 browser()->tab_strip_model()->GetActiveWebContents();
1618 content::Source<content::WebContents> source(current_web_contents); 1618 content::Source<content::WebContents> source(current_web_contents);
1619 1619
1620 ui_test_utils::WindowedNotificationObserverWithDetails< 1620 ui_test_utils::WindowedNotificationObserverWithDetails<
1621 LanguageDetectionDetails> 1621 LanguageDetectionDetails>
1622 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, 1622 fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
1623 source); 1623 source);
1624 fr_language_detected_signal.Wait(); 1624 fr_language_detected_signal.Wait();
1625 } 1625 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698