Infobar system refactor.

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

Index: chrome/browser/ui/views/infobars/before_translate_infobar.h
===================================================================
--- chrome/browser/ui/views/infobars/before_translate_infobar.h	(revision 226624)
+++ chrome/browser/ui/views/infobars/before_translate_infobar.h	(working copy)
@@ -5,12 +5,12 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_
 
-#include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/ui/views/infobars/translate_infobar_base.h"
-#include "chrome/browser/ui/views/infobars/translate_language_menu_model.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 
+class OptionsMenuModel;
 class TranslateInfoBarDelegate;
+class TranslateLanguageMenuModel;
 namespace views {
 class MenuButton;
 }
@@ -18,8 +18,8 @@
 class BeforeTranslateInfoBar : public TranslateInfoBarBase,
                                public views::MenuButtonListener {
  public:
-  BeforeTranslateInfoBar(InfoBarService* owner,
-                         TranslateInfoBarDelegate* delegate);
+  explicit BeforeTranslateInfoBar(
+      scoped_ptr<TranslateInfoBarDelegate> delegate);
 
  private:
   virtual ~BeforeTranslateInfoBar();
@@ -51,7 +51,7 @@
   views::MenuButton* options_menu_button_;
 
   scoped_ptr<TranslateLanguageMenuModel> language_menu_model_;
-  OptionsMenuModel options_menu_model_;
+  scoped_ptr<OptionsMenuModel> options_menu_model_;
 
   DISALLOW_COPY_AND_ASSIGN(BeforeTranslateInfoBar);
 };