Simplify the translate infobar code some.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/infobars/before_translate_infobar.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 
 BeforeTranslateInfoBar::BeforeTranslateInfoBar(
     InfoBarTabHelper* owner,
     TranslateInfoBarDelegate* delegate)
     : TranslateInfoBarBase(owner, delegate),
       label_1_(NULL),
       label_2_(NULL),
       language_menu_button_(NULL),
       accept_button_(NULL),
       deny_button_(NULL),
       never_translate_button_(NULL),
       always_translate_button_(NULL),
       options_menu_button_(NULL),
-      languages_menu_model_(delegate, LanguagesMenuModel::ORIGINAL),
       options_menu_model_(delegate) {
 }
 
 BeforeTranslateInfoBar::~BeforeTranslateInfoBar() {
 }
 
 void BeforeTranslateInfoBar::Layout() {
   TranslateInfoBarBase::Layout();
 
   int available_width = std::max(0, EndX() - StartX() - ContentMinimumWidth());
@@ skipping 55 matching lines @@
   }
 
   size_t offset = 0;
   string16 text(l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE,
                                            string16(), &offset));
 
   label_1_ = CreateLabel(text.substr(0, offset));
   AddChildView(label_1_);
 
   language_menu_button_ = CreateMenuButton(string16(), this);
+  TranslateInfoBarDelegate* delegate = GetDelegate();
+  language_menu_model_.reset(new TranslateLanguageMenuModel(
+      TranslateLanguageMenuModel::ORIGINAL, delegate, this,
+      language_menu_button_, false));
   AddChildView(language_menu_button_);
 
   label_2_ = CreateLabel(text.substr(offset));
   AddChildView(label_2_);
 
   accept_button_ = CreateTextButton(this,
       l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_ACCEPT), false);
   AddChildView(accept_button_);
 
   deny_button_ = CreateTextButton(this,
       l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_DENY), false);
   AddChildView(deny_button_);
 
-  TranslateInfoBarDelegate* delegate = GetDelegate();
-  const string16& language(delegate->GetLanguageDisplayableNameAt(
-      delegate->original_language_index()));
+  const string16& language(
+      delegate->language_name_at(delegate->original_language_index()));
   if (delegate->ShouldShowNeverTranslateButton()) {
     DCHECK(!delegate->ShouldShowAlwaysTranslateButton());
     never_translate_button_ = CreateTextButton(this,
         l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_NEVER_TRANSLATE,
                                    language), false);
     AddChildView(never_translate_button_);
   } else if (delegate->ShouldShowAlwaysTranslateButton()) {
     always_translate_button_ = CreateTextButton(this,
         l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_ALWAYS_TRANSLATE,
                                    language), false);
     AddChildView(always_translate_button_);
   }
 
   options_menu_button_ = CreateMenuButton(
       l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS), this);
   AddChildView(options_menu_button_);
 
   // This must happen after adding all other children so InfoBarView can ensure
   // the close button is the last child.
   TranslateInfoBarBase::ViewHierarchyChanged(is_add, parent, child);
 
   // This must happen after adding all children because it triggers layout,
   // which assumes that particular children (e.g. the close button) have already
   // been added.
-  OriginalLanguageChanged();
+  UpdateLanguageButtonText(language_menu_button_,
+      delegate->language_name_at(delegate->original_language_index()));
 }
 
 int BeforeTranslateInfoBar::ContentMinimumWidth() const {
   return
       (kButtonInLabelSpacing +
           language_menu_button_->GetPreferredSize().width() +
           kButtonInLabelSpacing) +
       (kEndOfLabelSpacing + accept_button_->GetPreferredSize().width()) +
       (kButtonButtonSpacing + deny_button_->GetPreferredSize().width()) +
       ((never_translate_button_ == NULL) ? 0 :
@@ skipping 17 matching lines @@
     RemoveSelf();
   } else if (sender == never_translate_button_) {
     delegate->NeverTranslatePageLanguage();
   } else if (sender == always_translate_button_) {
     delegate->AlwaysTranslatePageLanguage();
   } else {
     TranslateInfoBarBase::ButtonPressed(sender, event);
   }
 }
 
-void BeforeTranslateInfoBar::OriginalLanguageChanged() {
-  // Tests can call this function when the infobar has never been added to a
-  // view hierarchy and thus there is no button.
-  if (language_menu_button_) {
-    UpdateLanguageButtonText(language_menu_button_,
-                             LanguagesMenuModel::ORIGINAL);
-  }
-}
-
 void BeforeTranslateInfoBar::OnMenuButtonClicked(views::View* source,
                                                  const gfx::Point& point) {
   if (!owned())
     return;  // We're closing; don't call anything, it might access the owner.
-  ui::MenuModel* menu_model = NULL;
-  views::MenuButton* button = NULL;
-  views::MenuItemView::AnchorPosition anchor = views::MenuItemView::TOPLEFT;
   if (source == language_menu_button_) {
-    menu_model = &languages_menu_model_;
-    button = language_menu_button_;
+    RunMenuAt(language_menu_model_.get(), language_menu_button_,
+              views::MenuItemView::TOPLEFT);
   } else {
     DCHECK_EQ(options_menu_button_, source);
-    menu_model = &options_menu_model_;
-    button = options_menu_button_;
-    anchor = views::MenuItemView::TOPRIGHT;
+    RunMenuAt(&options_menu_model_, options_menu_button_,
+              views::MenuItemView::TOPRIGHT);
   }
-  RunMenuAt(menu_model, button, anchor);
 }