Cleanup:...

chrome/browser/ui/views/infobars/before_translate_infobar.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/views/infobars/before_translate_infobar.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/views/infobars/infobar_text_button.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_2.h"
 
 BeforeTranslateInfoBar::BeforeTranslateInfoBar(
     TranslateInfoBarDelegate* delegate)
     : TranslateInfoBarBase(delegate),
       never_translate_button_(NULL),
       always_translate_button_(NULL),
       languages_menu_model_(delegate, LanguagesMenuModel::ORIGINAL),
       options_menu_model_(delegate) {
   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(), true, this);
   AddChildView(language_menu_button_);
 
   label_2_ = CreateLabel(text.substr(offset));
   AddChildView(label_2_);
 
-  accept_button_ = InfoBarTextButton::CreateWithMessageID(this,
-      IDS_TRANSLATE_INFOBAR_ACCEPT);
+  accept_button_ = CreateTextButton(this,
+      l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_ACCEPT), false);
   AddChildView(accept_button_);
 
-  deny_button_ = InfoBarTextButton::CreateWithMessageID(this,
-      IDS_TRANSLATE_INFOBAR_DENY);
+  deny_button_ = CreateTextButton(this,
+      l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_DENY), false);
   AddChildView(deny_button_);
 
   const string16& language(delegate->GetLanguageDisplayableNameAt(
       delegate->original_language_index()));
   if (delegate->ShouldShowNeverTranslateButton()) {
-    never_translate_button_ = InfoBarTextButton::CreateWithMessageIDAndParam(
-        this, IDS_TRANSLATE_INFOBAR_NEVER_TRANSLATE, language);
+    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_ = InfoBarTextButton::CreateWithMessageIDAndParam(
-        this, IDS_TRANSLATE_INFOBAR_ALWAYS_TRANSLATE, language);
+    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), false, this);
   AddChildView(options_menu_button_);
 
   OriginalLanguageChanged();
 }
 
@@ skipping 77 matching lines @@
     if (!languages_menu_.get())
       languages_menu_.reset(new views::Menu2(&languages_menu_model_));
     languages_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
   } else {
     DCHECK_EQ(options_menu_button_, source);
     if (!options_menu_.get())
       options_menu_.reset(new views::Menu2(&options_menu_model_));
     options_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
   }
 }