Porting the infobars on Linux to the new TranslateInfobarDelegate2.

Each translate infobar is now its own class and most of the logic is in the delegate.

BUG=40828
TEST=Thoroughly test the translate feature on Linux.

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


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

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

1 files changed, 5 insertions, 12 deletions

diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index aaed42e..0d03414 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -34,10 +34,8 @@
 #include "chrome/browser/spellchecker_platform_engine.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/translate/translate_manager.h"
-#if defined(OS_WIN)
+#include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/translate/translate_manager2.h"
-#endif
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -465,7 +463,7 @@ void RenderViewContextMenu::AppendPageItems() {
   menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
 
   std::string locale = g_browser_process->GetApplicationLocale();
-  locale = TranslateManager::GetLanguageCode(locale);
+  locale = TranslateManager2::GetLanguageCode(locale);
   string16 language = l10n_util::GetDisplayNameForLocale(locale, locale, true);
   menu_model_.AddItem(
       IDC_CONTENT_CONTEXT_TRANSLATE,
@@ -739,11 +737,11 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
       std::string original_lang =
           source_tab_contents_->language_state().original_language();
       std::string target_lang = g_browser_process->GetApplicationLocale();
-      target_lang = TranslateManager::GetLanguageCode(target_lang);
+      target_lang = TranslateManager2::GetLanguageCode(target_lang);
       return original_lang != target_lang &&
              !source_tab_contents_->language_state().IsPageTranslated() &&
              !source_tab_contents_->interstitial_page() &&
-             TranslateManager::IsTranslatableURL(params_.page_url);
+             TranslateManager2::IsTranslatableURL(params_.page_url);
     }
 
     case IDC_CONTENT_CONTEXT_OPENLINKNEWTAB:
@@ -1148,19 +1146,14 @@ void RenderViewContextMenu::ExecuteCommand(int id) {
       std::string original_lang =
           source_tab_contents_->language_state().original_language();
       std::string target_lang = g_browser_process->GetApplicationLocale();
-      target_lang = TranslateManager::GetLanguageCode(target_lang);
+      target_lang = TranslateManager2::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());
       prefs.RemoveLanguageFromBlacklist(original_lang);
       prefs.RemoveSiteFromBlacklist(params_.page_url.HostNoBrackets());
-#if defined(OS_WIN)
       Singleton<TranslateManager2>::get()->TranslatePage(
           source_tab_contents_, original_lang, target_lang);
-#else
-      Singleton<TranslateManager>::get()->TranslatePage(
-          source_tab_contents_, original_lang, target_lang);
-#endif
       break;
     }