Tweaks for the merged menu:

views/controls/button/text_button.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/border.h"
@@ skipping 52 matching lines @@
 //
 // TextButton
 //
 //  A button which displays text and/or and icon that can be changed in
 //  response to actions. TextButton reserves space for the largest string
 //  passed to SetText. To reset the cached max size invoke ClearMaxTextSize.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class TextButton : public CustomButton {
  public:
+  // Enumeration of how the prefix ('&') character is processed. The default
+  // is |PREFIX_NONE|.
+  enum PrefixType {
+    // No special processing is done.
+    PREFIX_NONE,
+
+    // The character following the prefix character is not rendered specially.
+    PREFIX_HIDE,
+
+    // The character following the prefix character is underlined.
+    PREFIX_SHOW
+  };
+
   TextButton(ButtonListener* listener, const std::wstring& text);
   virtual ~TextButton();
 
   // Call SetText once per string in your set of possible values at button
   // creation time, so that it can contain the largest of them and avoid
   // resizing the button when the text changes.
   virtual void SetText(const std::wstring& text);
   std::wstring text() const { return text_; }
 
   enum TextAlignment {
     ALIGN_LEFT,
     ALIGN_CENTER,
     ALIGN_RIGHT
   };
 
   void set_alignment(TextAlignment alignment) { alignment_ = alignment; }
 
+  void set_prefix_type(PrefixType type) { prefix_type_ = type; }
+
   // Sets the icon.
   void SetIcon(const SkBitmap& icon);
   SkBitmap icon() const { return icon_; }
   void SetHoverIcon(const SkBitmap& icon);
   SkBitmap icon_hover() const { return icon_hover_; }
 
   // Meanings are reversed for right-to-left layouts.
   enum IconPlacement {
     ICON_ON_LEFT,
     ICON_ON_RIGHT
@@ skipping 28 matching lines @@
   virtual gfx::Size GetMinimumSize();
   virtual void SetEnabled(bool enabled);
 
   // Text colors.
   static const SkColor kEnabledColor;
   static const SkColor kHighlightColor;
   static const SkColor kDisabledColor;
   static const SkColor kHoverColor;
 
  protected:
-  virtual bool OnMousePressed(const MouseEvent& e);
   virtual void Paint(gfx::Canvas* canvas);
 
   // Called when enabled or disabled state changes, or the colors for those
   // states change.
   virtual void UpdateColor();
 
  private:
+  // Updates text_size_ and max_text_size_ from the current text/font. This is
+  // invoked when the font or text changes.
+  void UpdateTextSize();
+
   // The text string that is displayed in the button.
   std::wstring text_;
 
   // The size of the text string.
   gfx::Size text_size_;
 
   // Track the size of the largest text string seen so far, so that
   // changing text_ will not resize the button boundary.
   gfx::Size max_text_size_;
 
@@ skipping 25 matching lines @@
   // The width of the button will never be larger than this value. A value <= 0
   // indicates the width is not constrained.
   int max_width_;
 
   // This is true if normal state has a border frame; default is false.
   bool normal_has_border_;
 
   // Whether or not to show the highlighted (i.e. hot) state.
   bool show_highlighted_;
 
+  PrefixType prefix_type_;
+
   DISALLOW_COPY_AND_ASSIGN(TextButton);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_