Infobar system refactor.

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

Index: chrome/browser/ui/views/infobars/after_translate_infobar.h
===================================================================
--- chrome/browser/ui/views/infobars/after_translate_infobar.h	(revision 226624)
+++ chrome/browser/ui/views/infobars/after_translate_infobar.h	(working copy)
@@ -5,12 +5,12 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_AFTER_TRANSLATE_INFOBAR_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_AFTER_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,7 @@
 class AfterTranslateInfoBar : public TranslateInfoBarBase,
                               public views::MenuButtonListener {
  public:
-  AfterTranslateInfoBar(InfoBarService* owner,
-                        TranslateInfoBarDelegate* delegate);
+  explicit AfterTranslateInfoBar(scoped_ptr<TranslateInfoBarDelegate> delegate);
 
  private:
   virtual ~AfterTranslateInfoBar();
@@ -51,7 +50,7 @@
 
   scoped_ptr<TranslateLanguageMenuModel> original_language_menu_model_;
   scoped_ptr<TranslateLanguageMenuModel> target_language_menu_model_;
-  OptionsMenuModel options_menu_model_;
+  scoped_ptr<OptionsMenuModel> options_menu_model_;
 
   // True if the target language comes before the original one.
   bool swapped_language_buttons_;