Tweaks for the merged menu:

views/controls/button/text_button.cc

 // 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.
 
 #include "views/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
@@ skipping 16 matching lines @@
 // static
 const SkColor TextButton::kHighlightColor = SkColorSetARGB(200, 255, 255, 255);
 // static
 const SkColor TextButton::kDisabledColor = SkColorSetRGB(161, 161, 146);
 // static
 const SkColor TextButton::kHoverColor = TextButton::kEnabledColor;
 
 // How long the hover fade animation should last.
 static const int kHoverAnimationDurationMs = 170;
 
+static int PrefixTypeToCanvasType(TextButton::PrefixType type) {
+  switch (type) {
+    case TextButton::PREFIX_HIDE:
+      return gfx::Canvas::HIDE_PREFIX;
+    case TextButton::PREFIX_SHOW:
+      return gfx::Canvas::SHOW_PREFIX;
+    case TextButton::PREFIX_NONE:
+      return 0;
+    default:
+      NOTREACHED();
+      return 0;
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TextButtonBorder - constructors, destructors, initialization
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 TextButtonBorder::TextButtonBorder() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   hot_set_.top_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_LEFT_H);
@@ skipping 122 matching lines @@
       font_(ResourceBundle::GetSharedInstance().GetFont(
           ResourceBundle::BaseFont)),
       color_(kEnabledColor),
       color_enabled_(kEnabledColor),
       color_disabled_(kDisabledColor),
       color_highlight_(kHighlightColor),
       color_hover_(kHoverColor),
       has_hover_icon_(false),
       max_width_(0),
       normal_has_border_(false),
-      show_highlighted_(true) {
+      show_highlighted_(true),
+      prefix_type_(PREFIX_NONE) {
   SetText(text);
   set_border(new TextButtonBorder);
   SetAnimationDuration(kHoverAnimationDurationMs);
 }
 
 TextButton::~TextButton() {
 }
 
 void TextButton::SetText(const std::wstring& text) {
   text_ = text;
-  // Update our new current and max text size
-  text_size_.SetSize(font_.GetStringWidth(text_), font_.height());
-  max_text_size_.SetSize(std::max(max_text_size_.width(), text_size_.width()),
-                         std::max(max_text_size_.height(),
-                                  text_size_.height()));
+  UpdateTextSize();
 }
 
 void TextButton::SetIcon(const SkBitmap& icon) {
   icon_ = icon;
 }
 
 void TextButton::SetHoverIcon(const SkBitmap& icon) {
   icon_hover_ = icon;
   has_hover_icon_ = true;
 }
 
 void TextButton::SetFont(const gfx::Font& font) {
   font_ = font;
+  UpdateTextSize();
 }
 
 void TextButton::SetEnabledColor(SkColor color) {
   color_enabled_ = color;
   UpdateColor();
 }
 
 void TextButton::SetDisabledColor(SkColor color) {
   color_disabled_ = color;
   UpdateColor();
@@ skipping 93 matching lines @@
     // Due to the above, we must perform the flipping manually for RTL UIs.
     gfx::Rect text_bounds(text_x, text_y, text_width, text_size_.height());
     text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
 
     SkColor text_color;
     if (show_highlighted_ && (state() == BS_HOT || state() == BS_PUSHED))
       text_color = color_hover_;
     else
       text_color = color_;
 
+    int draw_string_flags = gfx::Canvas::DefaultCanvasTextAlignment() |
+        PrefixTypeToCanvasType(prefix_type_);
+
     if (for_drag) {
 #if defined(OS_WIN)
       // TODO(erg): Either port DrawStringWithHalo to linux or find an
       // alternative here.
       canvas->DrawStringWithHalo(text_, font_, text_color, color_highlight_,
                                  text_bounds.x(),
                                  text_bounds.y(),
                                  text_bounds.width(),
                                  text_bounds.height(),
-                                 gfx::Canvas::DefaultCanvasTextAlignment());
+                                 draw_string_flags);
 #else
       canvas->DrawStringInt(text_,
                             font_,
                             text_color,
                             text_bounds.x(),
                             text_bounds.y(),
                             text_bounds.width(),
-                            text_bounds.height());
+                            text_bounds.height(),
+                            draw_string_flags);
 #endif
     } else {
       canvas->DrawStringInt(text_,
                             font_,
                             text_color,
                             text_bounds.x(),
                             text_bounds.y(),
                             text_bounds.width(),
-                            text_bounds.height());
+                            text_bounds.height(),
+                            draw_string_flags);
     }
   }
 
   if (icon.width() > 0) {
     int icon_y = (available_height - icon.height()) / 2 + insets.top();
 
     // Mirroring the icon position if necessary.
     gfx::Rect icon_bounds(icon_x, icon_y, icon.width(), icon.height());
     icon_bounds.set_x(MirroredLeftPointForRect(icon_bounds));
     canvas->DrawBitmapInt(icon, icon_bounds.x(), icon_bounds.y());
   }
 }
 
 void TextButton::UpdateColor() {
   color_ = IsEnabled() ? color_enabled_ : color_disabled_;
 }
 
+void TextButton::UpdateTextSize() {
+  int width = 0, height = 0;
+  gfx::Canvas::SizeStringInt(
+      text_, font_, &width, &height,
+      gfx::Canvas::NO_ELLIPSIS | PrefixTypeToCanvasType(prefix_type_));
+  text_size_.SetSize(width, font_.height());
+  max_text_size_.SetSize(std::max(max_text_size_.width(), text_size_.width()),
+                         std::max(max_text_size_.height(),
+                                  text_size_.height()));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // TextButton, View overrides:
 
 gfx::Size TextButton::GetPreferredSize() {
   gfx::Insets insets = GetInsets();
 
   // Use the max size to set the button boundaries.
   gfx::Size prefsize(max_text_size_.width() + icon_.width() + insets.width(),
                      std::max(max_text_size_.height(), icon_.height()) +
                          insets.height());
@@ skipping 14 matching lines @@
 void TextButton::SetEnabled(bool enabled) {
   if (enabled != IsEnabled()) {
     CustomButton::SetEnabled(enabled);
   }
   // We should always call UpdateColor() since the state of the button might be
   // changed by other functions like CustomButton::SetState().
   UpdateColor();
   SchedulePaint();
 }
 
-bool TextButton::OnMousePressed(const MouseEvent& e) {
-  if (request_focus_on_press())
-    RequestFocus();
-  return true;
-}
-
 void TextButton::Paint(gfx::Canvas* canvas) {
   Paint(canvas, false);
 }
 
 }  // namespace views