ui: Clean up naming of paint-related identifiers

ui/views/controls/focusable_border.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/focusable_border.h"
 
 #include "cc/paint/paint_flags.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
@@ skipping 21 matching lines @@
 void FocusableBorder::SetColorId(
     const base::Optional<ui::NativeTheme::ColorId>& color_id) {
   override_color_id_ = color_id;
 }
 
 void FocusableBorder::Paint(const View& view, gfx::Canvas* canvas) {
   // In harmony, the focus indicator is a FocusRing.
   if (ui::MaterialDesignController::IsSecondaryUiMaterial() && view.HasFocus())
     return;
 
-  cc::PaintFlags paint;
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
-  paint.setColor(GetCurrentColor(view));
+  cc::PaintFlags flags;
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
+  flags.setColor(GetCurrentColor(view));
 
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     gfx::ScopedCanvas scoped(canvas);
     float dsf = canvas->UndoDeviceScaleFactor();
     // Scale the rect and snap to pixel boundaries.
     gfx::RectF rect(gfx::ScaleToEnclosingRect(view.GetLocalBounds(), dsf));
     rect.Inset(gfx::InsetsF(0.5f));
     SkPath path;
     float corner_radius_px = kCornerRadiusDp * dsf;
     path.addRoundRect(gfx::RectFToSkRect(rect), corner_radius_px,
                       corner_radius_px);
     const int kStrokeWidthPx = 1;
-    paint.setStrokeWidth(SkIntToScalar(kStrokeWidthPx));
-    paint.setAntiAlias(true);
-    canvas->DrawPath(path, paint);
+    flags.setStrokeWidth(SkIntToScalar(kStrokeWidthPx));
+    flags.setAntiAlias(true);
+    canvas->DrawPath(path, flags);
   } else {
     SkPath path;
     path.addRect(gfx::RectToSkRect(view.GetLocalBounds()),
                  SkPath::kCW_Direction);
-    paint.setStrokeWidth(SkIntToScalar(2));
-    canvas->DrawPath(path, paint);
+    flags.setStrokeWidth(SkIntToScalar(2));
+    canvas->DrawPath(path, flags);
   }
 }
 
 gfx::Insets FocusableBorder::GetInsets() const {
   return insets_;
 }
 
 gfx::Size FocusableBorder::GetMinimumSize() const {
   return gfx::Size();
 }
@@ skipping 13 matching lines @@
   SkColor color = view.GetNativeTheme()->GetSystemColor(color_id);
   if (ui::MaterialDesignController::IsSecondaryUiMaterial() &&
       !view.enabled()) {
     return color_utils::BlendTowardOppositeLuma(color,
                                                 gfx::kDisabledControlAlpha);
   }
   return color;
 }
 
 }  // namespace views