Reverts fix for 2554.

Review URL: http://codereview.chromium.org/4017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2445 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 7 deletions

diff --git a/chrome/views/chrome_menu.h b/chrome/views/chrome_menu.h
index b192c9c..05cce11 100644
--- a/chrome/views/chrome_menu.h
+++ b/chrome/views/chrome_menu.h
@@ -238,13 +238,11 @@ class MenuItemView : public View {
   virtual ~MenuItemView();
 
   // Run methods. See description above class for details. Both Run methods take
-  // a rectangle, which is used to position the menu. |has_mnemonics| indicates
-  // whether the items have mnemonics. Mnemonics are identified by way of the
-  // character following the '&'.
+  // a rectangle, which is used to position the menu.
   void RunMenuAt(HWND parent,
                  const gfx::Rect& bounds,
                  AnchorPosition anchor,
-                 bool has_mnemonics);
+                 bool show_mnemonics);
   void RunMenuForDropAt(HWND parent,
                         const gfx::Rect& bounds,
                         AnchorPosition anchor);
@@ -399,7 +397,7 @@ class MenuItemView : public View {
 
   // The RunXXX methods call into this to set up the necessary state before
   // running.
-  void PrepareForRun(bool has_mnemonics);
+  void PrepareForRun(bool show_mnemonics);
 
   // Returns the flags passed to DrawStringInt.
   int GetDrawStringFlags();
@@ -461,8 +459,8 @@ class MenuItemView : public View {
   // Icon.
   SkBitmap icon_;
 
-  // Does the title have a mnemonic?
-  bool has_mnemonics_;
+  // Whether mnemonics should be shown.
+  bool show_mnemonics_;
 
   DISALLOW_EVIL_CONSTRUCTORS(MenuItemView);
 };