[reland] views: Move MenuButton from TextButton to LabelButton.

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

 // Copyright (c) 2012 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/website_settings/permission_selector_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "grit/generated_resources.h"
@@ skipping 27 matching lines @@
   // Creates a new |PermissionMenuButton| with the passed |text|. The ownership
   // of the |model| remains with the caller and is not transfered to the
   // |PermissionMenuButton|. If the |show_menu_marker| flag is true, then a
   // small icon is be displayed next to the button |text|, indicating that the
   // button opens a drop down menu.
   PermissionMenuButton(const base::string16& text,
                        PermissionMenuModel* model,
                        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;
 
   // Overridden from views::View.
   virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
 
  private:
   // Overridden from views::MenuButtonListener.
   virtual void OnMenuButtonClicked(View* source,
                                    const gfx::Point& point) OVERRIDE;
 
   PermissionMenuModel* menu_model_;  // Owned by |PermissionSelectorView|.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionMenuButton);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // PermissionMenuButton
 ///////////////////////////////////////////////////////////////////////////////
 
 PermissionMenuButton::PermissionMenuButton(const base::string16& text,
                                            PermissionMenuModel* model,
                                            bool show_menu_marker)
     : MenuButton(NULL, text, this, show_menu_marker),
       menu_model_(model) {
-
 }
 
 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();
 }
 
 void PermissionMenuButton::GetAccessibleState(ui::AXViewState* state) {
   MenuButton::GetAccessibleState(state);
-  state->value = text();
+  state->value = GetText();
 }
 
 void PermissionMenuButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  SetEnabledColor(theme->GetSystemColor(
+  SetTextColor(views::Button::STATE_NORMAL, GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
-  SetHoverColor(theme->GetSystemColor(
+  SetTextColor(views::Button::STATE_HOVERED, GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
-  SetDisabledColor(theme->GetSystemColor(
+  SetTextColor(views::Button::STATE_DISABLED, GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor));
 }
 
 void PermissionMenuButton::OnMenuButtonClicked(View* source,
                                                const gfx::Point& point) {
   menu_runner_.reset(new views::MenuRunner(menu_model_));
 
   gfx::Point p(point);
   p.Offset(-source->width(), 0);
   if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
@@ skipping 107 matching lines @@
   // Update the menu button text to reflect the new setting.
   menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
       permission.setting,
       permission.default_setting,
       content_settings::SETTING_SOURCE_USER));
 
   FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
                     observer_list_,
                     OnPermissionChanged(permission));
 }