Translate: split supporting language list handling to TranslateLanguageList

chrome/browser/tab_contents/render_view_context_menu.cc

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 914e60cfea99357bc42a0c41e07a3fff243938f8..3bc3d6b82683d77a027c0a6f8954bc59bd421718 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -49,6 +49,7 @@
 #include "chrome/browser/tab_contents/retargeting_details.h"
 #include "chrome/browser/tab_contents/spellchecker_submenu_observer.h"
 #include "chrome/browser/tab_contents/spelling_menu_observer.h"
+#include "chrome/browser/translate/translate_language_list.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
@@ -924,7 +925,7 @@ void RenderViewContextMenu::AppendPageItems() {
 
   if (ShouldShowTranslateItem(params_.page_url)) {
     std::string locale = g_browser_process->GetApplicationLocale();
-    locale = TranslateManager::GetLanguageCode(locale);
+    locale = TranslateLanguageList::GetLanguageCode(locale);
     string16 language = l10n_util::GetDisplayNameForLocale(locale, locale,
                                                            true);
     menu_model_.AddItem(
@@ -1209,7 +1210,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
       std::string original_lang =
           translate_tab_helper->language_state().original_language();
       std::string target_lang = g_browser_process->GetApplicationLocale();
-      target_lang = TranslateManager::GetLanguageCode(target_lang);
+      target_lang = TranslateLanguageList::GetLanguageCode(target_lang);
       // Note that we intentionally enable the menu even if the original and
       // target languages are identical.  This is to give a way to user to
       // translate a page that might contains text fragments in a different
@@ -1221,13 +1222,13 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
              // unknown language (in which case the page language is detected on
              // the server side).
              (original_lang == chrome::kUnknownLanguageCode ||
-                 TranslateManager::IsSupportedLanguage(original_lang)) &&
+                 TranslateLanguageList::IsSupportedLanguage(original_lang)) &&
              !translate_tab_helper->language_state().IsPageTranslated() &&
              !source_web_contents_->GetInterstitialPage() &&
              TranslateManager::IsTranslatableURL(params_.page_url) &&
              // There are some application locales which can't be used as a
              // target language for translation.
-             TranslateManager::IsSupportedLanguage(target_lang);
+             TranslateLanguageList::IsSupportedLanguage(target_lang);
     }
 
     case IDC_CONTENT_CONTEXT_OPENLINKNEWTAB:
@@ -1780,7 +1781,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
       std::string original_lang =
           translate_tab_helper->language_state().original_language();
       std::string target_lang = g_browser_process->GetApplicationLocale();
-      target_lang = TranslateManager::GetLanguageCode(target_lang);
+      target_lang = TranslateLanguageList::GetLanguageCode(target_lang);
       // Since the user decided to translate for that language and site, clears
       // any preferences for not translating them.
       TranslatePrefs prefs(profile_->GetPrefs());