Update avatar button to MD (part 1)

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 <array>
 #include <memory>
 
@@ skipping 140 matching lines @@
   // NativeThemeDelegate:
   gfx::Rect GetThemePaintRect() const override;
 
   const std::array<bool, STATE_COUNT>& explicitly_set_colors() const {
     return explicitly_set_colors_;
   }
   void set_explicitly_set_colors(const std::array<bool, STATE_COUNT>& colors) {
     explicitly_set_colors_ = colors;
   }
 
+  // Returns true if the CreateInkDrop*() methods should create flood fill ink
+  // drop components.
+  virtual bool UseFloodFillInkDrop() const;

[Evan Stade, 2017/05/02 15:49:20]

nit: rearrange ordering in .cc file to match new order in header

and while we're at it, can we rename it to ShouldUseFloodFillInkDrop? I think
that's more idiomatic (doesn't sound like a command).

[emx, 2017/05/03 17:10:59]

Done.

+
  private:
   void SetTextInternal(const base::string16& text);
 
   // View:
   void ChildPreferredSizeChanged(View* child) override;
 
   // NativeThemeDelegate:
   ui::NativeTheme::Part GetThemePart() const override;
   ui::NativeTheme::State GetThemeState(
       ui::NativeTheme::ExtraParams* params) const override;
   const gfx::Animation* GetThemeAnimation() const override;
   ui::NativeTheme::State GetBackgroundThemeState(
       ui::NativeTheme::ExtraParams* params) const override;
   ui::NativeTheme::State GetForegroundThemeState(
       ui::NativeTheme::ExtraParams* params) const override;
 
   // Resets |cached_preferred_size_| and marks |cached_preferred_size_valid_|
   // as false.
   void ResetCachedPreferredSize();
 
   // Updates additional state related to focus or default status, rather than
   // merely the CustomButton::state(). E.g. ensures the label text color is
   // correct for the current background.
   void ResetLabelEnabledColor();
 
-  // Returns true if the CreateInkDrop*() methods should create flood fill ink
-  // drop components.
-  bool UseFloodFillInkDrop() const;
-
   // The image and label shown in the button.
   ImageView* image_;
   Label* label_;
 
   // A separate view is necessary to hold the ink drop layer so that it can
   // be stacked below |image_| and on top of |label_|, without resorting to
   // drawing |label_| on a layer (which can mess with subpixel anti-aliasing).
   InkDropContainerView* ink_drop_container_;
 
   // The cached font lists in the normal and bold style.
@@ skipping 37 matching lines @@
   gfx::HorizontalAlignment horizontal_alignment_;
 
   std::unique_ptr<Painter> focus_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(LabelButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_