Simplify the translate infobar code some.

chrome/browser/ui/views/infobars/translate_language_menu_model.cc

Index: chrome/browser/ui/views/infobars/translate_language_menu_model.cc
===================================================================
--- chrome/browser/ui/views/infobars/translate_language_menu_model.cc	(working copy)
+++ chrome/browser/ui/views/infobars/translate_language_menu_model.cc	(working copy)
@@ -2,52 +2,65 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/translate/languages_menu_model.h"
+#include "chrome/browser/ui/views/infobars/translate_language_menu_model.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
+#include "chrome/browser/ui/views/infobars/translate_infobar_base.h"
 
-LanguagesMenuModel::LanguagesMenuModel(
-    TranslateInfoBarDelegate* translate_delegate,
-    LanguageType language_type)
+TranslateLanguageMenuModel::TranslateLanguageMenuModel(
+    LanguageType language_type,
+    TranslateInfoBarDelegate* infobar_delegate,
+    TranslateInfoBarBase* infobar,
+    views::MenuButton* button,
+    bool translate_on_change)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
-      translate_infobar_delegate_(translate_delegate),
-      language_type_(language_type) {
-  for (size_t i = 0; i < translate_delegate->GetLanguageCount(); ++i) {
-    AddCheckItem(static_cast<int>(i),
-                 translate_delegate->GetLanguageDisplayableNameAt(i));
-  }
+      language_type_(language_type),
+      infobar_delegate_(infobar_delegate),
+      infobar_(infobar),
+      button_(button),
+      translate_on_change_(translate_on_change) {
+  for (size_t i = 0; i < infobar_delegate_->num_languages(); ++i)
+    AddCheckItem(static_cast<int>(i), infobar_delegate_->language_name_at(i));
 }
 
-LanguagesMenuModel::~LanguagesMenuModel() {
+TranslateLanguageMenuModel::~TranslateLanguageMenuModel() {
 }
 
-bool LanguagesMenuModel::IsCommandIdChecked(int command_id) const {
-  return static_cast<size_t>(command_id) == ((language_type_ == ORIGINAL) ?
-      translate_infobar_delegate_->original_language_index() :
-      translate_infobar_delegate_->target_language_index());
+bool TranslateLanguageMenuModel::IsCommandIdChecked(int command_id) const {
+  return static_cast<size_t>(command_id) == GetLanguageIndex();
 }
 
-bool LanguagesMenuModel::IsCommandIdEnabled(int command_id) const {
+bool TranslateLanguageMenuModel::IsCommandIdEnabled(int command_id) const {
   // Prevent the same language from being selectable in original and target.
   return static_cast<size_t>(command_id) != ((language_type_ == ORIGINAL) ?
-      translate_infobar_delegate_->target_language_index() :
-      translate_infobar_delegate_->original_language_index());
+      infobar_delegate_->target_language_index() :
+      infobar_delegate_->original_language_index());
 }
 
-bool LanguagesMenuModel::GetAcceleratorForCommandId(
+bool TranslateLanguageMenuModel::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
 
-void LanguagesMenuModel::ExecuteCommand(int command_id) {
+void TranslateLanguageMenuModel::ExecuteCommand(int command_id) {
   size_t command_id_size_t = static_cast<size_t>(command_id);
   if (language_type_ == ORIGINAL) {
     UMA_HISTOGRAM_COUNTS("Translate.ModifyOriginalLang", 1);
-    translate_infobar_delegate_->SetOriginalLanguage(command_id_size_t);
-    return;
+    infobar_delegate_->set_original_language_index(command_id_size_t);
+  } else {
+    UMA_HISTOGRAM_COUNTS("Translate.ModifyTargetLang", 1);
+    infobar_delegate_->set_target_language_index(command_id_size_t);
   }
-  UMA_HISTOGRAM_COUNTS("Translate.ModifyTargetLang", 1);
-  translate_infobar_delegate_->SetTargetLanguage(command_id_size_t);
+  infobar_->UpdateLanguageButtonText(button_,
+      infobar_delegate_->language_name_at(GetLanguageIndex()));
+  if (translate_on_change_)
+    infobar_delegate_->Translate();
 }
+
+size_t TranslateLanguageMenuModel::GetLanguageIndex() const {
+  return (language_type_ == ORIGINAL) ?
+      infobar_delegate_->original_language_index() :
+      infobar_delegate_->target_language_index();
+}