ash: Clean up naming of paint-related identifiers

ash/common/system/tray/tray_background_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 "ash/common/system/tray/tray_background_view.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 109 matching lines @@
         alpha_(0) {}
 
   ~TrayBackground() override {}
 
   void set_alpha(int alpha) { alpha_ = alpha; }
 
  private:
   WmShelf* GetShelf() const { return tray_background_view_->shelf(); }
 
   void PaintMaterial(gfx::Canvas* canvas, views::View* view) const {
-    cc::PaintFlags background_paint;
-    background_paint.setFlags(cc::PaintFlags::kAntiAlias_Flag);
-    background_paint.setColor(SkColorSetA(kShelfBaseColor, alpha_));
+    cc::PaintFlags background_flags;
+    background_flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
+    background_flags.setColor(SkColorSetA(kShelfBaseColor, alpha_));
     gfx::Insets insets =
         GetMirroredBackgroundInsets(GetShelf()->GetAlignment());
     gfx::Rect bounds = view->GetLocalBounds();
     bounds.Inset(insets);
-    canvas->DrawRoundRect(bounds, kTrayRoundedBorderRadius, background_paint);
+    canvas->DrawRoundRect(bounds, kTrayRoundedBorderRadius, background_flags);
 
     if (draws_active_ && tray_background_view_->is_active()) {
-      cc::PaintFlags highlight_paint;
-      highlight_paint.setFlags(cc::PaintFlags::kAntiAlias_Flag);
-      highlight_paint.setColor(kShelfButtonActivatedHighlightColor);
-      canvas->DrawRoundRect(bounds, kTrayRoundedBorderRadius, highlight_paint);
+      cc::PaintFlags highlight_flags;
+      highlight_flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
+      highlight_flags.setColor(kShelfButtonActivatedHighlightColor);
+      canvas->DrawRoundRect(bounds, kTrayRoundedBorderRadius, highlight_flags);
     }
   }
 
   void PaintNonMaterial(gfx::Canvas* canvas, views::View* view) const {
     const static int kImageTypeDefault = 0;
     // TODO(estade): leftover type which should be removed along with the rest
     // of pre-MD code.
     // const static int kImageTypeOnBlack = 1;
     const static int kImageTypePressed = 2;
     const static int kNumStates = 3;
@@ skipping 439 matching lines @@
   const bool horizontal_shelf = IsHorizontalAlignment(shelf_alignment_);
   const gfx::Rect local_bounds = GetLocalBounds();
   const int height = kTrayItemSize;
   const int x =
       horizontal_shelf
           ? (base::i18n::IsRTL() ? 0 : (local_bounds.width() - kSeparatorWidth))
           : (local_bounds.height() - kSeparatorWidth);
   const int y = (GetShelfConstant(SHELF_SIZE) - kTrayItemSize) / 2;
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float scale = canvas->UndoDeviceScaleFactor();
-  cc::PaintFlags paint;
-  paint.setColor(kSeparatorColor);
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setColor(kSeparatorColor);
+  flags.setAntiAlias(true);
 
   const gfx::Rect bounds = horizontal_shelf
                                ? gfx::Rect(x, y, kSeparatorWidth, height)
                                : gfx::Rect(y, x, height, kSeparatorWidth);
   gfx::RectF rect(gfx::ScaleRect(gfx::RectF(bounds), scale));
   gfx::PointF line_start =
       horizontal_shelf
           ? (base::i18n::IsRTL() ? rect.origin() : rect.top_right())
           : rect.bottom_left();
   gfx::PointF line_end =
       (horizontal_shelf && base::i18n::IsRTL() ? rect.bottom_left()
                                                : rect.bottom_right());
 
-  canvas->DrawLine(line_start, line_end, paint);
+  canvas->DrawLine(line_start, line_end, flags);
 }
 
 gfx::Insets TrayBackgroundView::GetBackgroundInsets() const {
   gfx::Insets insets = GetMirroredBackgroundInsets(shelf_alignment_);
 
   // |insets| are relative to contents bounds. Change them to be relative to
   // local bounds.
   gfx::Insets local_contents_insets =
       GetLocalBounds().InsetsFrom(GetContentsBounds());
   MirrorInsetsIfNecessary(&local_contents_insets);
   insets += local_contents_insets;
 
   return insets;
 }
 
 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const {
   gfx::Insets insets = GetBackgroundInsets();
   gfx::Rect bounds = GetLocalBounds();
   bounds.Inset(insets);
   return bounds;
 }
 
 }  // namespace ash