views::LabelButton should not call virtual methods from its constructor

ui/views/controls/button/label_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 10 matching lines @@
 
 // LabelButton is a button with text and an icon, it's not focusable by default.
 class VIEWS_EXPORT LabelButton : public CustomButton,
                                  public NativeThemeDelegate {
  public:
   // The length of the hover fade animation.
   static const int kHoverAnimationDurationMs;
 
   static const char kViewClassName[];
 
+  // Construct an uninitialized LabelButton with a Listener. Client code must
+  // also call InitAsTextbutton() or InitAsButton() to initialize the
+  // (possibly themed) button borders.
+  explicit LabelButton(ButtonListener* listener);
+
+  // Deprecated (calls virtual methods). TODO(tapted): Remove this overload.
   LabelButton(ButtonListener* listener, const base::string16& text);
+
   ~LabelButton() override;
 
+  // Initializes the LabelButton with STYLE_TEXTBUTTON. If borders have not been
+  // set with SetBorder(), creates default themed borders. These may also be
+  // customized by a subclass via CreateDefaultBorder().
+  void InitAsTextbutton(const base::string16& text);
+
+  // Initializes with STYLE_BUTTON and creates default borders if SetBorder()
+  // has not already been called.
+  void InitAsButton(const base::string16& text);
+
   // Get or set the image shown for the specified button state.
   // GetImage returns the image for STATE_NORMAL if the state's image is empty.
   virtual const gfx::ImageSkia& GetImage(ButtonState for_state);
   void SetImage(ButtonState for_state, const gfx::ImageSkia& image);
 
   // Get or set the text shown on the button.
   const base::string16& GetText() const;
   virtual void SetText(const base::string16& text);
 
   // Set the text color shown for the specified button state.
@@ skipping 22 matching lines @@
   void SetHorizontalAlignment(gfx::HorizontalAlignment alignment);
 
   // Call SetMinSize(gfx::Size()) to clear the monotonically increasing size.
   void SetMinSize(const gfx::Size& min_size);
   void SetMaxSize(const gfx::Size& max_size);
 
   // Get or set the option to handle the return key; false by default.
   bool is_default() const { return is_default_; }
   void SetIsDefault(bool is_default);
 
-  // Get or set the button's overall style; the default is |STYLE_TEXTBUTTON|.
+  // Gets the button's overall style.
   ButtonStyle style() const { return style_; }
+
+  // Sets the button style and updates (possibly themed) borders. TODO(tapted):
+  // Make this method protected after callers have switched to InitAsButton().
   void SetStyle(ButtonStyle style);
 
   // Set the spacing between the image and the text. Shrinking the spacing
   // will not shrink the overall button size, as it is monotonically increasing.
   // Call SetMinSize(gfx::Size()) to clear the size if needed.
   void SetImageLabelSpacing(int spacing);
 
   void SetFocusPainter(scoped_ptr<Painter> focus_painter);
   Painter* focus_painter() { return focus_painter_.get(); }
 
@@ skipping 32 matching lines @@
   void UpdateImage();
 
   // Updates the border as per the NativeTheme, unless a different border was
   // set with SetBorder.
   void UpdateThemedBorder();
 
   // NativeThemeDelegate:
   gfx::Rect GetThemePaintRect() const override;
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(BlueButtonTest, Border);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Image);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, LabelAndImage);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, FontList);
 
   // CustomButton:
   void StateChanged() override;
 
   // View:
@@ skipping 52 matching lines @@
   int image_label_spacing_;
 
   scoped_ptr<Painter> focus_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(LabelButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_