Just set borders once when creating a views::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 "chrome/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);
   ~PermissionMenuButton() override;
 
-  // Overridden from views::LabelButton.
-  void SetText(const base::string16& text) override;
-
   // Overridden from views::View.
   void GetAccessibleState(ui::AXViewState* state) override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
  private:
   // Overridden from views::MenuButtonListener.
   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() {
 }
 
-void PermissionMenuButton::SetText(const base::string16& text) {
-  MenuButton::SetText(text);
-  SizeToPreferredSize();
-}
-
 void PermissionMenuButton::GetAccessibleState(ui::AXViewState* state) {
   MenuButton::GetAccessibleState(state);
   state->value = GetText();
 }
 
 void PermissionMenuButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  SetTextColor(views::Button::STATE_NORMAL, GetNativeTheme()->GetSystemColor(
+  SetTextColor(views::Button::STATE_NORMAL, theme->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
-  SetTextColor(views::Button::STATE_HOVERED, GetNativeTheme()->GetSystemColor(
+  SetTextColor(views::Button::STATE_HOVERED, theme->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
-  SetTextColor(views::Button::STATE_DISABLED, GetNativeTheme()->GetSystemColor(
+  SetTextColor(views::Button::STATE_DISABLED, theme->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor));
 }
 
 void PermissionMenuButton::OnMenuButtonClicked(View* source,
                                                const gfx::Point& point) {
   menu_runner_.reset(
       new views::MenuRunner(menu_model_, views::MenuRunner::HAS_MNEMONICS));
 
   gfx::Point p(point);
   p.Offset(-source->width(), 0);
@@ skipping 101 matching lines @@
 void PermissionSelectorView::PermissionChanged(
     const WebsiteSettingsUI::PermissionInfo& permission) {
   // Change the permission icon to reflect the selected setting.
   const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(permission);
   icon_->SetImage(image.ToImageSkia());
 
   // Update the menu button text to reflect the new setting.
   menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
       permission.type, permission.setting, permission.default_setting,
       content_settings::SETTING_SOURCE_USER));
+  menu_button_->SizeToPreferredSize();
 
   FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
                     observer_list_,
                     OnPermissionChanged(permission));
 }