Simplify the translate infobar code some.

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

 // 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.
 
-#ifndef CHROME_BROWSER_TRANSLATE_LANGUAGES_MENU_MODEL_H_
-#define CHROME_BROWSER_TRANSLATE_LANGUAGES_MENU_MODEL_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_TRANSLATE_LANGUAGE_MENU_MODEL_H_
+#define CHROME_BROWSER_UI_VIEWS_INFOBARS_TRANSLATE_LANGUAGE_MENU_MODEL_H_
 
 #include "ui/base/models/simple_menu_model.h"
 
+class TranslateInfoBarBase;
 class TranslateInfoBarDelegate;
+namespace views {
+class MenuButton;
+}
 
 // A menu model that builds the contents of the language menus in the translate
 // infobar. This menu has only one level (no submenus).
-class LanguagesMenuModel : public ui::SimpleMenuModel,
-                           public ui::SimpleMenuModel::Delegate {
+class TranslateLanguageMenuModel : public ui::SimpleMenuModel,
+                                   public ui::SimpleMenuModel::Delegate {
  public:
   enum LanguageType {
     ORIGINAL,
     TARGET
   };
-  LanguagesMenuModel(TranslateInfoBarDelegate* translate_delegate,
-                     LanguageType language_type);
-  virtual ~LanguagesMenuModel();
+  TranslateLanguageMenuModel(LanguageType language_type,

[sky, 2012/09/19 14:18:07]

nit: newline between 24/25

+                             TranslateInfoBarDelegate* infobar_delegate,
+                             TranslateInfoBarBase* infobar,
+                             views::MenuButton* button,
+                             bool translate_on_change);
+  virtual ~TranslateLanguageMenuModel();
 
   // ui::SimpleMenuModel::Delegate implementation:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
  private:
-  TranslateInfoBarDelegate* translate_infobar_delegate_;
+  size_t GetLanguageIndex() const;
+
   LanguageType language_type_;
+  TranslateInfoBarDelegate* infobar_delegate_;
+  TranslateInfoBarBase* infobar_;
+  views::MenuButton* button_;
+  bool translate_on_change_;

[sky, 2012/09/19 14:18:07]

nit: const

 
-  DISALLOW_COPY_AND_ASSIGN(LanguagesMenuModel);
+  DISALLOW_COPY_AND_ASSIGN(TranslateLanguageMenuModel);
 };
 
-#endif  // CHROME_BROWSER_TRANSLATE_LANGUAGES_MENU_MODEL_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_TRANSLATE_LANGUAGE_MENU_MODEL_H_