Add GetMinimumSize() for Borders, and make LabelButton auto-size to at least as

chrome/browser/ui/views/toolbar/wrench_menu.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 123 matching lines @@
 
   // Overridden from views::Border.
   virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE {
     // Painting of border is done in MenuButtonBackground.
   }
 
   virtual gfx::Insets GetInsets() const OVERRIDE {
     return insets_;
   }
 
+  virtual gfx::Size GetMinimumSize() const OVERRIDE {
+    // This size is sufficient for MenuButtonBackground::Paint() to draw any of
+    // the button types.
+    return gfx::Size(4, 4);
+  }
+
  private:
   // The horizontal padding dependent on the layout.
   const int horizontal_padding_;
 
   const gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuButtonBorder);
 };
 
 // Combination border/background for the buttons contained in the menu. The
@@ skipping 46 matching lines @@
                          BorderColor(view, CustomButton::STATE_NORMAL));
       }
       canvas->FillRect(gfx::Rect(border, 0, w - border, h),
                        touch_background_color(state));
       return;
     }
 #endif
     const SkColor background = BackgroundColor(view, state);
     const SkColor border = BorderColor(view, state);
     switch (TypeAdjustedForRTL()) {
+      // TODO(pkasting): Why don't all the following use SkPaths with rounded
+      // corners?
       case LEFT_BUTTON:
         canvas->FillRect(gfx::Rect(1, 1, w, h - 2), background);
         canvas->FillRect(gfx::Rect(2, 0, w, 1), border);
         canvas->FillRect(gfx::Rect(1, 1, 1, 1), border);
         canvas->FillRect(gfx::Rect(0, 2, 1, h - 4), border);
         canvas->FillRect(gfx::Rect(1, h - 2, 1, 1), border);
         canvas->FillRect(gfx::Rect(2, h - 1, w, 1), border);
         break;
 
       case CENTER_BUTTON: {
@@ skipping 1083 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }
 
 int WrenchMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }