ui: Clean up naming of paint-related identifiers

ui/views/controls/focus_ring.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/focus_ring.h"
 
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/focusable_border.h"
 
@@ skipping 51 matching lines @@
 
 void FocusRing::Layout() {
   // The focus ring handles its own sizing, which is simply to fill the parent
   // and extend a little beyond its borders.
   gfx::Rect focus_bounds = parent()->GetLocalBounds();
   focus_bounds.Inset(gfx::Insets(-kFocusHaloThicknessDp));
   SetBoundsRect(focus_bounds);
 }
 
 void FocusRing::OnPaint(gfx::Canvas* canvas) {
-  cc::PaintFlags paint;
-  paint.setAntiAlias(true);
-  paint.setColor(
+  cc::PaintFlags flags;
+  flags.setAntiAlias(true);
+  flags.setColor(
       SkColorSetA(GetNativeTheme()->GetSystemColor(
                       override_color_id_ != ui::NativeTheme::kColorId_NumColors
                           ? override_color_id_
                           : ui::NativeTheme::kColorId_FocusedBorderColor),
                   0x66));
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
-  paint.setStrokeWidth(kFocusHaloThicknessDp);
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
+  flags.setStrokeWidth(kFocusHaloThicknessDp);
   gfx::RectF rect(GetLocalBounds());
   rect.Inset(gfx::InsetsF(kFocusHaloThicknessDp / 2.f));
-  canvas->DrawRoundRect(rect, kFocusHaloCornerRadiusDp, paint);
+  canvas->DrawRoundRect(rect, kFocusHaloCornerRadiusDp, flags);
 }
 
 FocusRing::FocusRing()
     : override_color_id_(ui::NativeTheme::kColorId_NumColors) {
   // A layer is necessary to paint beyond the parent's bounds.
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);
 }
 
 FocusRing::~FocusRing() {}
 
 }  // namespace views