Clean up naming of paint-related identifiers

chrome/browser/ui/views/create_application_shortcut_view.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 "chrome/browser/ui/views/create_application_shortcut_view.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <cmath>
 #include <utility>
@@ skipping 17 matching lines @@
 #include "components/favicon_base/select_favicon_frames.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_family.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/image_view.h"
@@ skipping 128 matching lines @@
 void AppInfoView::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect bounds = GetLocalBounds();
 
   SkRect border_rect = {
     SkIntToScalar(bounds.x()),
     SkIntToScalar(bounds.y()),
     SkIntToScalar(bounds.right()),
     SkIntToScalar(bounds.bottom())
   };
 
-  cc::PaintFlags border_paint;
-  border_paint.setAntiAlias(true);
-  border_paint.setARGB(0xFF, 0xC8, 0xC8, 0xC8);
+  cc::PaintFlags border_flags;
+  border_flags.setAntiAlias(true);
+  border_flags.setARGB(0xFF, 0xC8, 0xC8, 0xC8);
 
   canvas->sk_canvas()->drawRoundRect(border_rect, SkIntToScalar(2),
-                                     SkIntToScalar(2), border_paint);
+                                     SkIntToScalar(2), border_flags);
 
   SkRect inner_rect = {
     border_rect.fLeft + SkDoubleToScalar(0.5),
     border_rect.fTop + SkDoubleToScalar(0.5),
     border_rect.fRight - SkDoubleToScalar(0.5),
     border_rect.fBottom - SkDoubleToScalar(0.5),
   };
 
-  cc::PaintFlags inner_paint;
-  inner_paint.setAntiAlias(true);
-  inner_paint.setARGB(0xFF, 0xF8, 0xF8, 0xF8);
+  cc::PaintFlags inner_flags;
+  inner_flags.setAntiAlias(true);
+  inner_flags.setARGB(0xFF, 0xF8, 0xF8, 0xF8);
   canvas->sk_canvas()->drawRoundRect(inner_rect, SkDoubleToScalar(1.5),
-                                     SkDoubleToScalar(1.5), inner_paint);
+                                     SkDoubleToScalar(1.5), inner_flags);
 }
 
 }  // namespace
 
 namespace chrome {
 
 void ShowCreateWebAppShortcutsDialog(gfx::NativeWindow parent_window,
                                      content::WebContents* web_contents) {
   constrained_window::CreateBrowserModalDialogViews(
       new CreateUrlApplicationShortcutView(web_contents),
@@ skipping 323 matching lines @@
 bool CreateChromeApplicationShortcutView::Cancel() {
   if (!close_callback_.is_null())
     close_callback_.Run(false);
   return CreateApplicationShortcutView::Cancel();
 }
 
 void CreateChromeApplicationShortcutView::OnAppInfoLoaded(
     std::unique_ptr<web_app::ShortcutInfo> shortcut_info) {
   shortcut_info_ = std::move(shortcut_info);
 }