Make MdTextButton a LabelButton, use it in the DL shelf.

ui/views/controls/button/md_text_button.h

 // Copyright 2015 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_MD_TEXT_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "ui/views/controls/button/custom_button.h"
-
-namespace gfx {
-class RenderText;
-}
+#include "ui/views/animation/button_ink_drop_delegate.h"
+#include "ui/views/controls/button/label_button.h"
 
 namespace views {
 
 // A button class that implements the Material Design text button spec.
-class VIEWS_EXPORT MdTextButton : public CustomButton {
+class VIEWS_EXPORT MdTextButton : public LabelButton {

[sky, 2016/03/08 16:37:34]

Once md is the default, what is the plan for this class? How does one know when
they want to use MdTextButton::CreateStandardButton vs creating a LabelButton
directly?

[Evan Stade, 2016/03/08 21:59:16]

I'm not 100% sure this will be possible, but ideally LabelButton::SetStyle goes
away and the pattern of

button = new LabelButton
button->SetStyle(BUTTONBUTTON);

becomes

button = MdTextButton::Create();

LabelButton will still exist separately from MdTextButton because other stuff
like MenuButton extends it, but LabelButton itself will hopefully be an abstract
class.

  public:
-  MdTextButton(ButtonListener* listener, const base::string16& text);
+  // Creates a normal STYLE_BUTTON LabelButton in pre-MD, or an MdTextButton
+  // in MD mode.
+  static LabelButton* CreateStandardButton(ButtonListener* listener,
+                                           const base::string16& text);
+
+  // LabelButton:
+  SkColor GetInkDropBaseColor() const override;
+  void SetText(const base::string16& text) override;
+
+ private:
+ // void UpdateColor();
+  MdTextButton(ButtonListener* listener);
   ~MdTextButton() override;
 
-  // View:
-  void OnPaint(gfx::Canvas* canvas) override;
-  gfx::Size GetPreferredSize() const override;
-
- private:
-  void UpdateColor();
-
-  scoped_ptr<gfx::RenderText> render_text_;
+  ButtonInkDropDelegate ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(MdTextButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_