Move TranslateInfoBarDelegate and OptionsMenuModel to the Translate component.

components/translate/core/browser/options_menu_model.h

Index: components/translate/core/browser/options_menu_model.h
diff --git a/chrome/browser/translate/options_menu_model.h b/components/translate/core/browser/options_menu_model.h
similarity index 69%
rename from chrome/browser/translate/options_menu_model.h
rename to components/translate/core/browser/options_menu_model.h
index f178ca1a7902140245a7aaa9978bc33ec7b27bea..7390017500f8b15b3aeb76d247b0abea6986a759 100644
--- a/chrome/browser/translate/options_menu_model.h
+++ b/components/translate/core/browser/options_menu_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_TRANSLATE_OPTIONS_MENU_MODEL_H_
-#define CHROME_BROWSER_TRANSLATE_OPTIONS_MENU_MODEL_H_
+#ifndef COMPONENTS_TRANSLATE_CORE_BROWSER_OPTIONS_MENU_MODEL_H_
+#define COMPONENTS_TRANSLATE_CORE_BROWSER_OPTIONS_MENU_MODEL_H_
 
 #include "ui/base/models/simple_menu_model.h"
 
@@ -25,10 +25,17 @@ class OptionsMenuModel : public ui::SimpleMenuModel,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
 
+  // Command IDs of the items in this menu; exposed for testing.
+  static const int kOptionsAboutTranslate;

[Peter Kasting, 2014/05/21 20:38:24]

Nit: Style guide says static consts go above all functions (right below typedefs
and enums).

Is it necessary to have "Options" in front of all these constants, when they're
already scoped to the "OptionsMenuModel" class?

+  static const int kOptionsAlwaysTranslate;
+  static const int kOptionsNeverTranslateLanguage;
+  static const int kOptionsNeverTranslateSite;
+  static const int kOptionsReportBadDetection;
+
  private:
   TranslateInfoBarDelegate* translate_infobar_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(OptionsMenuModel);
 };
 
-#endif  // CHROME_BROWSER_TRANSLATE_OPTIONS_MENU_MODEL_H_
+#endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_OPTIONS_MENU_MODEL_H_