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

ui/views/controls/button/md_text_button.h

Index: ui/views/controls/button/md_text_button.h
diff --git a/ui/views/controls/button/md_text_button.h b/ui/views/controls/button/md_text_button.h
index ba982a32a9363a2129b714c3ef34df3dedf45dd8..041251b5f6620a43901ab55ac431e5f3e1fc1ec7 100644
--- a/ui/views/controls/button/md_text_button.h
+++ b/ui/views/controls/button/md_text_button.h
@@ -6,28 +6,29 @@
 #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 {
  public:
-  MdTextButton(ButtonListener* listener, const base::string16& text);
-  ~MdTextButton() override;
+  // Creates a normal STYLE_BUTTON LabelButton in pre-MD, or an MdTextButton
+  // in MD mode.
+  static LabelButton* CreateStandardButton(ButtonListener* listener,

[Evan Stade, 2016/03/08 02:04:15]

This factory function is useful even in an all-md world because it allows us to
construct and then init in one line (at the callsite).

+                                           const base::string16& text);
 
-  // View:
-  void OnPaint(gfx::Canvas* canvas) override;
-  gfx::Size GetPreferredSize() const override;
+  // LabelButton:
+  SkColor GetInkDropBaseColor() const override;
+  void SetText(const base::string16& text) override;
 
  private:
-  void UpdateColor();
+ // void UpdateColor();
+  MdTextButton(ButtonListener* listener);
+  ~MdTextButton() override;
 
-  scoped_ptr<gfx::RenderText> render_text_;
+  ButtonInkDropDelegate ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(MdTextButton);
 };