views: Move MenuButton from TextButton to LabelButton.

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

Index: chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc b/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc
index c3c5d7dbadcfd1f634906ba0fbcbb8eb26add41c..e4c5936e5b4d80b4a00b4a597633fac8f0f518d3 100644
--- a/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc
@@ -7,14 +7,13 @@
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
+#include "ui/views/painter.h"
 
 WrenchToolbarButton::WrenchToolbarButton(views::MenuButtonListener* listener)
-    : views::MenuButton(NULL, base::string16(), listener, false) {
+    : views::MenuButton(NULL, base::string16(), listener, false),
+      preferred_size_(ResourceBundle::GetSharedInstance().

[sky, 2014/06/09 15:42:00]

I say nuke the member and look up every time you need it.

[Elliot Glaysher, 2014/06/11 00:27:28]

Done.

+                      GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size()) {
   wrench_icon_painter_.reset(new WrenchIconPainter(this));
-
-  // Used for sizing only.
-  ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  SetIcon(*rb.GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER));
 }
 
 WrenchToolbarButton::~WrenchToolbarButton() {
@@ -25,6 +24,10 @@ void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity,
   wrench_icon_painter_->SetSeverity(severity, animate);
 }
 
+gfx::Size WrenchToolbarButton::GetPreferredSize() const {
+  return preferred_size_;
+}
+
 void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) {
   wrench_icon_painter_->Paint(
       canvas, GetThemeProvider(), gfx::Rect(size()), GetCurrentBezelType());