Clean up naming of paint-related identifiers

chrome/browser/download/download_shelf.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.
 
 #define _USE_MATH_DEFINES  // For VC++ to get M_PI. This has to be first.
 
 #include "chrome/browser/download/download_shelf.h"
 
 #include <cmath>
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/web_contents.h"
-#include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/canvas.h"
 
 using content::DownloadItem;
 
 namespace {
 
@@ skipping 25 matching lines @@
 
 // Download progress painting --------------------------------------------------
 
 // static
 void DownloadShelf::PaintDownloadProgress(
     gfx::Canvas* canvas,
     const ui::ThemeProvider& theme_provider,
     const base::TimeDelta& progress_time,
     int percent_done) {
   // Draw background (light blue circle).
-  cc::PaintFlags bg_paint;
-  bg_paint.setStyle(cc::PaintFlags::kFill_Style);
+  cc::PaintFlags bg_flags;
+  bg_flags.setStyle(cc::PaintFlags::kFill_Style);
   SkColor indicator_color =
       theme_provider.GetColor(ThemeProperties::COLOR_TAB_THROBBER_SPINNING);
-  bg_paint.setColor(SkColorSetA(indicator_color, 0x33));
-  bg_paint.setAntiAlias(true);
+  bg_flags.setColor(SkColorSetA(indicator_color, 0x33));
+  bg_flags.setAntiAlias(true);
   const SkScalar kCenterPoint = kProgressIndicatorSize / 2.f;
   SkPath bg;
   bg.addCircle(kCenterPoint, kCenterPoint, kCenterPoint);
-  canvas->DrawPath(bg, bg_paint);
+  canvas->DrawPath(bg, bg_flags);
 
   // Calculate progress.
   SkScalar sweep_angle = 0.f;
   // Start at 12 o'clock.
   SkScalar start_pos = SkIntToScalar(270);
   if (percent_done < 0) {
     // For unknown size downloads, draw a 50 degree sweep that moves at
     // 0.08 degrees per millisecond.
     sweep_angle = 50.f;
     start_pos += static_cast<SkScalar>(progress_time.InMilliseconds() * 0.08);
   } else if (percent_done > 0) {
     sweep_angle = static_cast<SkScalar>(360 * percent_done / 100.0);
   }
 
   // Draw progress.
   SkPath progress;
   progress.addArc(
       SkRect::MakeLTRB(0, 0, kProgressIndicatorSize, kProgressIndicatorSize),
       start_pos, sweep_angle);
-  cc::PaintFlags progress_paint;
-  progress_paint.setColor(indicator_color);
-  progress_paint.setStyle(cc::PaintFlags::kStroke_Style);
-  progress_paint.setStrokeWidth(1.7f);
-  progress_paint.setAntiAlias(true);
-  canvas->DrawPath(progress, progress_paint);
+  cc::PaintFlags progress_flags;
+  progress_flags.setColor(indicator_color);
+  progress_flags.setStyle(cc::PaintFlags::kStroke_Style);
+  progress_flags.setStrokeWidth(1.7f);
+  progress_flags.setAntiAlias(true);
+  canvas->DrawPath(progress, progress_flags);
 }
 
 // static
 void DownloadShelf::PaintDownloadComplete(
     gfx::Canvas* canvas,
     const ui::ThemeProvider& theme_provider,
     double animation_progress) {
   // Start at full opacity, then loop back and forth five times before ending
   // at zero opacity.
   canvas->SaveLayerAlpha(GetOpacity(animation_progress));
@@ skipping 108 matching lines @@
   content::DownloadManager* download_manager = GetDownloadManager();
   if (!download_manager)
     return;
 
   DownloadItem* download = download_manager->GetDownload(download_id);
   if (!download)
     return;
 
   ShowDownload(download);
 }