views: Move MenuButton from TextButton to LabelButton.

chrome/browser/ui/views/website_settings/permission_selector_view.cc

Index: chrome/browser/ui/views/website_settings/permission_selector_view.cc
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
index 883fc38508f4b31f1cd554a5c5b10bb0ed33d3c8..3f94b75bad9f6722d8beeb0bd93d29a2d6104200 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
@@ -45,9 +45,6 @@ class PermissionMenuButton : public views::MenuButton,
                        bool show_menu_marker);
   virtual ~PermissionMenuButton();
 
-  // Overridden from views::MenuButton.
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-
   // Overridden from views::TextButton.
   virtual void SetText(const base::string16& text) OVERRIDE;
 
@@ -74,33 +71,17 @@ PermissionMenuButton::PermissionMenuButton(const base::string16& text,
                                            bool show_menu_marker)
     : MenuButton(NULL, text, this, show_menu_marker),
       menu_model_(model) {
-  SetEnabledColor(GetNativeTheme()->GetSystemColor(
+  SetTextColor(views::Button::STATE_NORMAL, GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
-  SetHoverColor(GetNativeTheme()->GetSystemColor(
+  SetTextColor(views::Button::STATE_HOVERED, GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
-  SetDisabledColor(GetNativeTheme()->GetSystemColor(
+  SetTextColor(views::Button::STATE_DISABLED, GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor));
 }
 
 PermissionMenuButton::~PermissionMenuButton() {
 }
 
-gfx::Size PermissionMenuButton::GetPreferredSize() const {
-  gfx::Insets insets = GetInsets();
-  // Scale the button to the current text size.
-  gfx::Size prefsize(text_size_.width() + insets.width(),
-                     text_size_.height() + insets.height());
-  if (max_width_ > 0)
-    prefsize.set_width(std::min(max_width_, prefsize.width()));
-  if (show_menu_marker()) {
-    prefsize.Enlarge(menu_marker()->width() +
-                         views::MenuButton::kMenuMarkerPaddingLeft +
-                         views::MenuButton::kMenuMarkerPaddingRight,
-                     0);
-  }
-  return prefsize;
-}
-
 void PermissionMenuButton::SetText(const base::string16& text) {
   MenuButton::SetText(text);
   SizeToPreferredSize();
@@ -108,13 +89,15 @@ void PermissionMenuButton::SetText(const base::string16& text) {
 
 void PermissionMenuButton::GetAccessibleState(ui::AXViewState* state) {
   MenuButton::GetAccessibleState(state);
-  state->value = text();
+  state->value = GetText();
 }
 
 void PermissionMenuButton::OnMenuButtonClicked(View* source,
                                                const gfx::Point& point) {
   menu_runner_.reset(new views::MenuRunner(menu_model_));
 
+  LOG(ERROR) << "PermissionMenuButton::OnMenuButtonClicked";
+
   gfx::Point p(point);
   p.Offset(-source->width(), 0);
   if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),