ui: Clean up naming of paint-related identifiers

ui/views/controls/md_slider.cc

 // Copyright 2016 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/md_slider.h"
 
 #include "cc/paint/paint_flags.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/animation/slide_animation.h"
@@ skipping 42 matching lines @@
   const int full = GetAnimatingValue() * width;
   const int empty = width - full;
   const int y = content.height() / 2 - kLineThickness / 2;
   const int x = content.x() + full + kThumbRadius;
   const SkColor current_thumb_color =
       is_active_ ? kActiveColor : kDisabledColor;
 
   // Extra space used to hide slider ends behind the thumb.
   const int extra_padding = 1;
 
-  cc::PaintFlags slider_paint;
-  slider_paint.setAntiAlias(true);
-  slider_paint.setColor(current_thumb_color);
+  cc::PaintFlags slider_flags;
+  slider_flags.setAntiAlias(true);
+  slider_flags.setColor(current_thumb_color);
   canvas->DrawRoundRect(
       gfx::Rect(content.x(), y, full + extra_padding, kLineThickness),
-      kSliderRoundedRadius, slider_paint);
-  slider_paint.setColor(kDisabledColor);
+      kSliderRoundedRadius, slider_flags);
+  slider_flags.setColor(kDisabledColor);
   canvas->DrawRoundRect(gfx::Rect(x + kThumbRadius - extra_padding, y,
                                   empty + extra_padding, kLineThickness),
-                        kSliderRoundedRadius, slider_paint);
+                        kSliderRoundedRadius, slider_flags);
 
   gfx::Point thumb_center(x, content.height() / 2);
 
   // Paint the thumb highlight if it exists.
   const int thumb_highlight_radius =
       HasFocus() ? kThumbHighlightRadius : thumb_highlight_radius_;
   if (is_active_ && thumb_highlight_radius > kThumbRadius) {
     cc::PaintFlags highlight;
     SkColor kHighlightColor = SkColorSetA(kActiveColor, kHighlightColorAlpha);
     highlight.setColor(kHighlightColor);
     highlight.setFlags(cc::PaintFlags::kAntiAlias_Flag);
     canvas->DrawCircle(thumb_center, thumb_highlight_radius, highlight);
   }
 
   // Paint the thumb of the slider.
-  cc::PaintFlags paint;
-  paint.setColor(current_thumb_color);
-  paint.setFlags(cc::PaintFlags::kAntiAlias_Flag);
+  cc::PaintFlags flags;
+  flags.setColor(current_thumb_color);
+  flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
 
   if (!is_active_) {
-    paint.setStrokeWidth(kThumbStroke);
-    paint.setStyle(cc::PaintFlags::kStroke_Style);
+    flags.setStrokeWidth(kThumbStroke);
+    flags.setStyle(cc::PaintFlags::kStroke_Style);
   }
   canvas->DrawCircle(
       thumb_center,
-      is_active_ ? kThumbRadius : (kThumbRadius - kThumbStroke / 2), paint);
+      is_active_ ? kThumbRadius : (kThumbRadius - kThumbStroke / 2), flags);
 }
 
 const char* MdSlider::GetClassName() const {
   return "MdSlider";
 }
 
 void MdSlider::UpdateState(bool control_on) {
   is_active_ = control_on;
   SchedulePaint();
 }
@@ skipping 31 matching lines @@
     Slider::AnimationEnded(animation);
     return;
   }
   if (animation == highlight_animation_.get() &&
       !highlight_animation_->IsShowing()) {
     highlight_animation_.reset();
   }
 }
 
 }  // namespace views