ui: Clean up naming of paint-related identifiers

ui/views/controls/progress_bar.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/progress_bar.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 58 matching lines @@
 
 void ProgressBar::OnPaint(gfx::Canvas* canvas) {
   if (IsIndeterminate())
     return OnPaintIndeterminate(canvas);
 
   gfx::Rect content_bounds = GetContentsBounds();
 
   // Draw background.
   SkPath background_path;
   AddPossiblyRoundRectToPath(content_bounds, &background_path);
-  cc::PaintFlags background_paint;
-  background_paint.setStyle(cc::PaintFlags::kFill_Style);
-  background_paint.setAntiAlias(true);
-  background_paint.setColor(GetBackgroundColor());
-  canvas->DrawPath(background_path, background_paint);
+  cc::PaintFlags background_flags;
+  background_flags.setStyle(cc::PaintFlags::kFill_Style);
+  background_flags.setAntiAlias(true);
+  background_flags.setColor(GetBackgroundColor());
+  canvas->DrawPath(background_path, background_flags);
 
   // Draw slice.
   SkPath slice_path;
   const int slice_width = static_cast<int>(
       content_bounds.width() * std::min(current_value_, 1.0) + 0.5);
   if (slice_width < 1)
     return;
 
   gfx::Rect slice_bounds = content_bounds;
   slice_bounds.set_width(slice_width);
   AddPossiblyRoundRectToPath(slice_bounds, &slice_path);
 
-  cc::PaintFlags slice_paint;
-  slice_paint.setStyle(cc::PaintFlags::kFill_Style);
-  slice_paint.setAntiAlias(true);
-  slice_paint.setColor(GetForegroundColor());
-  canvas->DrawPath(slice_path, slice_paint);
+  cc::PaintFlags slice_flags;
+  slice_flags.setStyle(cc::PaintFlags::kFill_Style);
+  slice_flags.setAntiAlias(true);
+  slice_flags.setColor(GetForegroundColor());
+  canvas->DrawPath(slice_path, slice_flags);
 }
 
 void ProgressBar::SetValue(double value) {
   double adjusted_value = (value < 0.0 || value > 1.0) ? -1.0 : value;
 
   if (adjusted_value == current_value_)
     return;
 
   current_value_ = adjusted_value;
   if (IsIndeterminate()) {
@@ skipping 33 matching lines @@
 bool ProgressBar::IsIndeterminate() {
   return current_value_ < 0.0;
 }
 
 void ProgressBar::OnPaintIndeterminate(gfx::Canvas* canvas) {
   gfx::Rect content_bounds = GetContentsBounds();
 
   // Draw background.
   SkPath background_path;
   AddPossiblyRoundRectToPath(content_bounds, &background_path);
-  cc::PaintFlags background_paint;
-  background_paint.setStyle(cc::PaintFlags::kFill_Style);
-  background_paint.setAntiAlias(true);
-  background_paint.setColor(GetBackgroundColor());
-  canvas->DrawPath(background_path, background_paint);
+  cc::PaintFlags background_flags;
+  background_flags.setStyle(cc::PaintFlags::kFill_Style);
+  background_flags.setAntiAlias(true);
+  background_flags.setColor(GetBackgroundColor());
+  canvas->DrawPath(background_path, background_flags);
 
   // Draw slice.
   SkPath slice_path;
   double time = indeterminate_bar_animation_->GetCurrentValue();
 
   // The animation spec corresponds to the material design lite's parameter.
   // (cf. https://github.com/google/material-design-lite/)
   double bar1_left;
   double bar1_width;
   double bar2_left;
@@ skipping 23 matching lines @@
       content_bounds.width() * std::min(1.0, bar2_left + bar2_width));
 
   gfx::Rect slice_bounds = content_bounds;
   slice_bounds.set_x(content_bounds.x() + bar1_start_x);
   slice_bounds.set_width(bar1_end_x - bar1_start_x);
   AddPossiblyRoundRectToPath(slice_bounds, &slice_path);
   slice_bounds.set_x(content_bounds.x() + bar2_start_x);
   slice_bounds.set_width(bar2_end_x - bar2_start_x);
   AddPossiblyRoundRectToPath(slice_bounds, &slice_path);
 
-  cc::PaintFlags slice_paint;
-  slice_paint.setStyle(cc::PaintFlags::kFill_Style);
-  slice_paint.setAntiAlias(true);
-  slice_paint.setColor(GetForegroundColor());
-  canvas->DrawPath(slice_path, slice_paint);
+  cc::PaintFlags slice_flags;
+  slice_flags.setStyle(cc::PaintFlags::kFill_Style);
+  slice_flags.setAntiAlias(true);
+  slice_flags.setColor(GetForegroundColor());
+  canvas->DrawPath(slice_path, slice_flags);
 }
 
 }  // namespace views