GTK: Move TranslateInfoBarBase::BuildOptionsMenuButton to InfoBarGtk::CreateMenuButton

chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.cc

 // Copyright (c) 2011 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/gtk/infobars/translate_infobar_base_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
@@ skipping 45 matching lines @@
 
 TranslateInfoBarBase::~TranslateInfoBarBase() {
 }
 
 void TranslateInfoBarBase::Init() {
   if (!ShowOptionsMenuButton())
     return;
 
   // The options button sits outside the translate_box so that it can be end
   // packed in hbox_.
-  GtkWidget* options_menu_button = BuildOptionsMenuButton();
+  GtkWidget* options_menu_button = CreateMenuButton(
+      l10n_util::GetStringUTF8(IDS_TRANSLATE_INFOBAR_OPTIONS));
   Signals()->Connect(options_menu_button, "clicked",
                      G_CALLBACK(&OnOptionsClickedThunk), this);
   gtk_widget_show_all(options_menu_button);
   gtk_util::CenterWidgetInHBox(hbox_, options_menu_button, true, 0);
 }
 
 void TranslateInfoBarBase::GetTopColor(InfoBarDelegate::Type type,
                                        double* r, double* g, double* b) {
   if (background_error_percent_ <= 0) {
     InfoBarGtk::GetTopColor(InfoBarDelegate::PAGE_ACTION_TYPE, r, g, b);
@@ skipping 104 matching lines @@
   gtk_tree_model_get(gtk_combo_box_get_model(combo), &iter,
                      LANGUAGE_COMBO_COLUMN_ID, &id,
                      -1);
   return static_cast<size_t>(id);
 }
 
 TranslateInfoBarDelegate* TranslateInfoBarBase::GetDelegate() {
   return static_cast<TranslateInfoBarDelegate*>(delegate());
 }
 
-// static
-GtkWidget* TranslateInfoBarBase::BuildOptionsMenuButton() {
-  GtkWidget* button = gtk_button_new();
-  GtkWidget* former_child = gtk_bin_get_child(GTK_BIN(button));
-  if (former_child)
-    gtk_container_remove(GTK_CONTAINER(button), former_child);
-
-  GtkWidget* hbox = gtk_hbox_new(FALSE, 0);
-
-  GtkWidget* label = gtk_label_new(
-      l10n_util::GetStringUTF8(IDS_TRANSLATE_INFOBAR_OPTIONS).c_str());
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
-  GtkWidget* arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-  gtk_box_pack_start(GTK_BOX(hbox), arrow, FALSE, FALSE, 0);
-
-  gtk_container_add(GTK_CONTAINER(button), hbox);
-
-  return button;
-}
-
 void TranslateInfoBarBase::OnOptionsClicked(GtkWidget* sender) {
   ShowMenuWithModel(sender, NULL, new OptionsMenuModel(GetDelegate()));
 }
 
 // TranslateInfoBarDelegate specific method:
 InfoBar* TranslateInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   TranslateInfoBarBase* infobar = NULL;
   switch (type_) {
     case BEFORE_TRANSLATE:
       infobar = new BeforeTranslateInfoBar(owner, this);
       break;
     case AFTER_TRANSLATE:
       infobar = new AfterTranslateInfoBar(owner, this);
       break;
     case TRANSLATING:
     case TRANSLATION_ERROR:
       infobar = new TranslateMessageInfoBar(owner, this);
       break;
     default:
       NOTREACHED();
   }
   infobar->Init();
   return infobar;
 }