Unverified Commit 3c9e9b34 authored by liyuqian's avatar liyuqian Committed by GitHub

Revert "Remove mixin so we can roll Google3 (#22819)" (#22926)

This reverts commit c689c97d.

The Dart analyzer in Google3 has been upgraded so we won't need this.
parent c12b99f2
......@@ -161,7 +161,7 @@ class FlatButton extends MaterialButton {
///
/// This class only exists to give FlatButtons created with [FlatButton.icon]
/// a distinct class for the sake of [ButtonTheme]. It can not be instantiated.
class _FlatButtonWithIcon extends FlatButton implements MaterialButtonWithIconMixin {
class _FlatButtonWithIcon extends FlatButton with MaterialButtonWithIconMixin {
_FlatButtonWithIcon({
Key key,
@required VoidCallback onPressed,
......
......@@ -282,6 +282,4 @@ class MaterialButton extends StatelessWidget {
///
/// This mixin only exists to give the "label and icon" button widgets a distinct
/// type for the sake of [ButtonTheme].
abstract class MaterialButtonWithIconMixin {
MaterialButtonWithIconMixin._();
}
mixin MaterialButtonWithIconMixin { }
......@@ -185,7 +185,7 @@ class OutlineButton extends MaterialButton {
//
// This class only exists to give RaisedButtons created with [RaisedButton.icon]
// a distinct class for the sake of [ButtonTheme]. It can not be instantiated.
class _OutlineButtonWithIcon extends OutlineButton implements MaterialButtonWithIconMixin {
class _OutlineButtonWithIcon extends OutlineButton with MaterialButtonWithIconMixin {
_OutlineButtonWithIcon({
Key key,
@required VoidCallback onPressed,
......
......@@ -171,7 +171,7 @@ class RaisedButton extends MaterialButton {
///
/// This class only exists to give RaisedButtons created with [RaisedButton.icon]
/// a distinct class for the sake of [ButtonTheme]. It can not be instantiated.
class _RaisedButtonWithIcon extends RaisedButton implements MaterialButtonWithIconMixin {
class _RaisedButtonWithIcon extends RaisedButton with MaterialButtonWithIconMixin {
_RaisedButtonWithIcon({
Key key,
@required VoidCallback onPressed,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment