Update avatar button to MD (part 1)

ui/views/controls/button/label_button.cc

 // 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.
 
 #include "ui/views/controls/button/label_button.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 415 matching lines @@
   InstallInkDropMask(ink_drop_layer);
 }
 
 void LabelButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   image()->DestroyLayer();
   ResetInkDropMask();
   ink_drop_container_->RemoveInkDropLayer(ink_drop_layer);
 }
 
 std::unique_ptr<InkDrop> LabelButton::CreateInkDrop() {
-  return UseFloodFillInkDrop() ? CreateDefaultFloodFillInkDropImpl()
-                               : CustomButton::CreateInkDrop();
+  return ShouldUseFloodFillInkDrop() ? CreateDefaultFloodFillInkDropImpl()
+                                     : CustomButton::CreateInkDrop();
 }
 
 std::unique_ptr<views::InkDropRipple> LabelButton::CreateInkDropRipple() const {
-  return UseFloodFillInkDrop()
+  return ShouldUseFloodFillInkDrop()
              ? base::MakeUnique<views::FloodFillInkDropRipple>(
                    size(), GetInkDropCenterBasedOnLastEvent(),
                    GetInkDropBaseColor(), ink_drop_visible_opacity())
              : CreateDefaultInkDropRipple(
                    image()->GetMirroredBounds().CenterPoint());
 }
 
 std::unique_ptr<views::InkDropHighlight> LabelButton::CreateInkDropHighlight()
     const {
-  return UseFloodFillInkDrop()
+  return ShouldUseFloodFillInkDrop()
              ? base::MakeUnique<views::InkDropHighlight>(
                    size(), kInkDropSmallCornerRadius,
                    gfx::RectF(GetLocalBounds()).CenterPoint(),
                    GetInkDropBaseColor())
              : CreateDefaultInkDropHighlight(
                    gfx::RectF(image()->GetMirroredBounds()).CenterPoint());
 }
 
 void LabelButton::StateChanged(ButtonState old_state) {
   const gfx::Size previous_image_size(image_->GetPreferredSize());
@@ skipping 93 matching lines @@
 }
 
 ui::NativeTheme::Part LabelButton::GetThemePart() const {
   return ui::NativeTheme::kPushButton;
 }
 
 gfx::Rect LabelButton::GetThemePaintRect() const {
   return GetLocalBounds();
 }
 
+bool LabelButton::ShouldUseFloodFillInkDrop() const {
+  return !GetText().empty();
+}
+
 ui::NativeTheme::State LabelButton::GetThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   switch (state()) {
     case STATE_NORMAL:   return ui::NativeTheme::kNormal;
     case STATE_HOVERED:  return ui::NativeTheme::kHovered;
     case STATE_PRESSED:  return ui::NativeTheme::kPressed;
     case STATE_DISABLED: return ui::NativeTheme::kDisabled;
     case STATE_COUNT:    NOTREACHED() << "Unknown state: " << state();
   }
@@ skipping 23 matching lines @@
 
 void LabelButton::ResetLabelEnabledColor() {
   const SkColor color =
       explicitly_set_colors_[state()]
           ? button_state_colors_[state()]
           : PlatformStyle::TextColorForButton(button_state_colors_, *this);
   if (state() != STATE_DISABLED && label_->enabled_color() != color)
     label_->SetEnabledColor(color);
 }
 
-bool LabelButton::UseFloodFillInkDrop() const {
-  return !GetText().empty();
-}
-
 }  // namespace views