Just set borders once when creating a views::LabelButton

ui/views/controls/button/label_button.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 "ui/views/controls/button/label_button.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
@@ skipping 65 matching lines @@
   SetText(text);
 
   AddChildView(image_);
   image_->set_interactive(false);
 
   AddChildView(label_);
   label_->SetFontList(cached_normal_font_list_);
   label_->SetAutoColorReadabilityEnabled(false);
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
-  // Initialize the colors, border, and layout.
-  SetStyle(style_);
-
-  SetAccessibleName(text);

[tapted, 2015/07/13 07:41:22]

After updating the Init tests, it seemed silly to keep this redundant statement.
It didn't really have good test coverage, so I added some, but let me know if
you want that split out.

+  // Inset the button focus rect from the actual border; roughly match Windows.
+  SetFocusPainter(
+      Painter::CreateDashedFocusPainterWithInsets(gfx::Insets(3, 3, 3, 3)));
 }
 
 LabelButton::~LabelButton() {}
 
 const gfx::ImageSkia& LabelButton::GetImage(ButtonState for_state) {
   if (for_state != STATE_NORMAL && button_state_images_[for_state].isNull())
     return button_state_images_[STATE_NORMAL];
   return button_state_images_[for_state];
 }
 
@@ skipping 82 matching lines @@
   is_default_ ? AddAccelerator(accel) : RemoveAccelerator(accel);
 
   // STYLE_BUTTON uses bold text to indicate default buttons.
   if (style_ == STYLE_BUTTON) {
     label_->SetFontList(
         is_default ? cached_bold_font_list_ : cached_normal_font_list_);
   }
 }
 
 void LabelButton::SetStyle(ButtonStyle style) {
+  // All callers currently pass STYLE_BUTTON, and should only call this once, to
+  // change from the default style.
+  DCHECK_EQ(style, STYLE_BUTTON);
+  DCHECK_EQ(style_, STYLE_TEXTBUTTON);
+  DCHECK(!GetWidget()) << "Can't change button style after adding to a Widget.";
+
   style_ = style;
-  // Inset the button focus rect from the actual border; roughly match Windows.
-  if (style == STYLE_BUTTON) {
-    SetFocusPainter(nullptr);
-  } else {
-    SetFocusPainter(Painter::CreateDashedFocusPainterWithInsets(
-                        gfx::Insets(3, 3, 3, 3)));
-  }
-  if (style == STYLE_BUTTON) {
-    label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
-    SetFocusable(true);
-  }
-  if (style == STYLE_BUTTON)
-    SetMinSize(gfx::Size(70, 33));
-  OnNativeThemeChanged(GetNativeTheme());
-  ResetCachedPreferredSize();
+
+  SetFocusPainter(nullptr);
+  label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  SetFocusable(true);
+  SetMinSize(gfx::Size(70, 33));
+
+  // Themed borders will be set once the button is added to a Widget, since that
+  // provides the value of GetNativeTheme().
 }
 
 void LabelButton::SetImageLabelSpacing(int spacing) {
   if (spacing == image_label_spacing_)
     return;
   image_label_spacing_ = spacing;
   ResetCachedPreferredSize();
   InvalidateLayout();
 }
 
@@ skipping 298 matching lines @@
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 void LabelButton::ResetCachedPreferredSize() {
   cached_preferred_size_valid_ = false;
   cached_preferred_size_ = gfx::Size();
 }
 
 }  // namespace views