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

Unified Diff: chrome/browser/tab_contents/render_view_context_menu.cc

Issue 133273029: Move LanguageState to the translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment + rebase 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/render_view_context_menu.cc
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 98787bf86307a7c7dfb643feccbbafa14f48f1d7..daee2153d5ce760ae1ab2f01ab8f10da0635f826 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -1229,7 +1229,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
if (!translate_tab_helper)
return false;
std::string original_lang =
- translate_tab_helper->language_state().original_language();
+ translate_tab_helper->GetLanguageState().original_language();
std::string target_lang = g_browser_process->GetApplicationLocale();
target_lang = TranslateManager::GetLanguageCode(target_lang);
// Note that we intentionally enable the menu even if the original and
@@ -1238,7 +1238,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
// language.
return ((params_.edit_flags & WebContextMenuData::CanTranslate) != 0) &&
!original_lang.empty() && // Did we receive the page language yet?
- !translate_tab_helper->language_state().IsPageTranslated() &&
+ !translate_tab_helper->GetLanguageState().IsPageTranslated() &&
!source_web_contents_->GetInterstitialPage() &&
// There are some application locales which can't be used as a
// target language for translation.
@@ -1806,12 +1806,12 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
TranslateTabHelper* translate_tab_helper =
TranslateTabHelper::FromWebContents(source_web_contents_);
if (!translate_tab_helper ||
- translate_tab_helper->language_state().IsPageTranslated() ||
- translate_tab_helper->language_state().translation_pending()) {
+ translate_tab_helper->GetLanguageState().IsPageTranslated() ||
+ translate_tab_helper->GetLanguageState().translation_pending()) {
return;
}
std::string original_lang =
- translate_tab_helper->language_state().original_language();
+ translate_tab_helper->GetLanguageState().original_language();
std::string target_lang = g_browser_process->GetApplicationLocale();
target_lang = TranslateManager::GetLanguageCode(target_lang);
// Since the user decided to translate for that language and site, clears
« no previous file with comments | « chrome/browser/tab_contents/language_state_unittest.cc ('k') | chrome/browser/translate/translate_infobar_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698