ui: Clean up naming of paint-related identifiers

ui/views/controls/scrollbar/overlay_scroll_bar.cc

 // Copyright 2013 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/scrollbar/overlay_scroll_bar.h"
 
 #include "base/macros.h"
 #include "cc/paint/paint_flags.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
@@ skipping 34 matching lines @@
 gfx::Size OverlayScrollBar::Thumb::GetPreferredSize() const {
   // The visual size of the thumb is kThumbThickness, but it slides back and
   // forth by kThumbHoverOffset. To make event targetting work well, expand the
   // width of the thumb such that it's always taking up the full width of the
   // track regardless of the offset.
   return gfx::Size(kThumbThickness + kThumbHoverOffset,
                    kThumbThickness + kThumbHoverOffset);
 }
 
 void OverlayScrollBar::Thumb::OnPaint(gfx::Canvas* canvas) {
-  cc::PaintFlags fill_paint;
-  fill_paint.setStyle(cc::PaintFlags::kFill_Style);
-  fill_paint.setColor(SK_ColorBLACK);
+  cc::PaintFlags fill_flags;
+  fill_flags.setStyle(cc::PaintFlags::kFill_Style);
+  fill_flags.setColor(SK_ColorBLACK);
   gfx::RectF fill_bounds(GetLocalBounds());
   fill_bounds.Inset(gfx::InsetsF(IsHorizontal() ? kThumbHoverOffset : 0,
                                  IsHorizontal() ? 0 : kThumbHoverOffset, 0, 0));
   fill_bounds.Inset(gfx::InsetsF(kThumbStroke, kThumbStroke,
                                  IsHorizontal() ? 0 : kThumbStroke,
                                  IsHorizontal() ? kThumbStroke : 0));
-  canvas->DrawRect(fill_bounds, fill_paint);
+  canvas->DrawRect(fill_bounds, fill_flags);
 
-  cc::PaintFlags stroke_paint;
-  stroke_paint.setStyle(cc::PaintFlags::kStroke_Style);
-  stroke_paint.setColor(SK_ColorWHITE);
-  stroke_paint.setStrokeWidth(kThumbStroke);
+  cc::PaintFlags stroke_flags;
+  stroke_flags.setStyle(cc::PaintFlags::kStroke_Style);
+  stroke_flags.setColor(SK_ColorWHITE);
+  stroke_flags.setStrokeWidth(kThumbStroke);
   gfx::RectF stroke_bounds(fill_bounds);
   stroke_bounds.Inset(gfx::InsetsF(kThumbStroke / 2.f));
   // The stroke doesn't apply to the far edge of the thumb.
   SkPath path;
   path.moveTo(gfx::PointFToSkPoint(stroke_bounds.top_right()));
   path.lineTo(gfx::PointFToSkPoint(stroke_bounds.origin()));
   path.lineTo(gfx::PointFToSkPoint(stroke_bounds.bottom_left()));
   if (IsHorizontal()) {
     path.moveTo(gfx::PointFToSkPoint(stroke_bounds.bottom_right()));
     path.close();
   } else {
     path.lineTo(gfx::PointFToSkPoint(stroke_bounds.bottom_right()));
   }
-  canvas->DrawPath(path, stroke_paint);
+  canvas->DrawPath(path, stroke_flags);
 }
 
 void OverlayScrollBar::Thumb::OnBoundsChanged(
     const gfx::Rect& previous_bounds) {
   scroll_bar_->Show();
   // Don't start the hide countdown if the thumb is still hovered or pressed.
   if (GetState() == CustomButton::STATE_NORMAL)
     scroll_bar_->StartHideCountdown();
 }
 
@@ skipping 77 matching lines @@
 
 void OverlayScrollBar::StartHideCountdown() {
   if (IsMouseHovered())
     return;
   hide_timer_.Start(
       FROM_HERE, base::TimeDelta::FromSeconds(1),
       base::Bind(&OverlayScrollBar::Hide, base::Unretained(this)));
 }
 
 }  // namespace views