Refactored the translate infobars.

chrome/browser/translate/options_menu_model.h

Index: chrome/browser/translate/options_menu_model.h
diff --git a/chrome/browser/translate/options_menu_model.h b/chrome/browser/translate/options_menu_model.h
index c6de2f31a8a755933c9750a6c451d0421e4890aa..b4a5a21b803090859404b93ab797e41ecbb4839b 100644
--- a/chrome/browser/translate/options_menu_model.h
+++ b/chrome/browser/translate/options_menu_model.h
@@ -8,16 +8,24 @@
 #include "app/menus/simple_menu_model.h"
 
 class TranslateInfoBarDelegate;
+class TranslateInfoBarDelegate2;
+class String16;
 
 // A menu model that builds the contents of the options menu in the translate
 // infobar. This menu has only one level (no submenus).
 class OptionsMenuModel : public menus::SimpleMenuModel {
  public:
-  explicit OptionsMenuModel(menus::SimpleMenuModel::Delegate* menu_delegate,
-      TranslateInfoBarDelegate* translate_delegate);
+  // TODO(jcivelli): remove this constructor once we have migrated to the new
+  //                 translate infobars.
+  OptionsMenuModel(menus::SimpleMenuModel::Delegate* menu_delegate,
+                   TranslateInfoBarDelegate* translate_delegate);
+  OptionsMenuModel(menus::SimpleMenuModel::Delegate* menu_delegate,
+                   TranslateInfoBarDelegate2* translate_delegate);
   virtual ~OptionsMenuModel();
 
  private:
+  void Init(const string16& original_language, const string16& target_language);
+
   DISALLOW_COPY_AND_ASSIGN(OptionsMenuModel);
 };