ash: Clean up naming of paint-related identifiers

ash/autoclick/common/autoclick_ring_handler.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 "ash/autoclick/common/autoclick_ring_handler.h"
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/aura/window.h"
@@ skipping 27 matching lines @@
 // completes at the end of the animation.
 const int kAutoclickRingAngleEndValue = 360;
 
 // Visual constants.
 const SkColor kAutoclickRingArcColor = SkColorSetARGB(255, 0, 255, 0);
 const SkColor kAutoclickRingCircleColor = SkColorSetARGB(255, 0, 0, 255);
 
 void PaintAutoclickRingCircle(gfx::Canvas* canvas,
                               gfx::Point& center,
                               int radius) {
-  cc::PaintFlags paint;
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
-  paint.setStrokeWidth(2 * kAutoclickRingArcWidth);
-  paint.setColor(kAutoclickRingCircleColor);
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
+  flags.setStrokeWidth(2 * kAutoclickRingArcWidth);
+  flags.setColor(kAutoclickRingCircleColor);
+  flags.setAntiAlias(true);
 
-  canvas->DrawCircle(center, radius, paint);
+  canvas->DrawCircle(center, radius, flags);
 }
 
 void PaintAutoclickRingArc(gfx::Canvas* canvas,
                            const gfx::Point& center,
                            int radius,
                            int start_angle,
                            int end_angle) {
-  cc::PaintFlags paint;
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
-  paint.setStrokeWidth(2 * kAutoclickRingArcWidth);
-  paint.setColor(kAutoclickRingArcColor);
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
+  flags.setStrokeWidth(2 * kAutoclickRingArcWidth);
+  flags.setColor(kAutoclickRingArcColor);
+  flags.setAntiAlias(true);
 
   SkPath arc_path;
   arc_path.addArc(SkRect::MakeXYWH(center.x() - radius, center.y() - radius,
                                    2 * radius, 2 * radius),
                   start_angle, end_angle - start_angle);
-  canvas->DrawPath(arc_path, paint);
+  canvas->DrawPath(arc_path, flags);
 }
 }  // namespace
 
 // View of the AutoclickRingHandler. Draws the actual contents and updates as
 // the animation proceeds. It also maintains the views::Widget that the
 // animation is shown in.
 class AutoclickRingHandler::AutoclickRingView : public views::View {
  public:
   AutoclickRingView(const gfx::Point& event_location,
                     views::Widget* ring_widget)
@@ skipping 173 matching lines @@
       current_animation_type_ = AnimationType::NONE;
       break;
     case AnimationType::NONE:
       // fall through to reset the view.
       view_.reset();
       break;
   }
 }
 
 }  // namespace ash