ash: Clean up naming of paint-related identifiers

ash/common/shelf/overflow_button.cc

 // Copyright 2013 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/shelf/overflow_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/ink_drop_button_listener.h"
 #include "ash/common/shelf/shelf_constants.h"
@@ skipping 101 matching lines @@
 
 std::unique_ptr<views::InkDropMask> OverflowButton::CreateInkDropMask() const {
   gfx::Insets insets = GetLocalBounds().InsetsFrom(CalculateButtonBounds());
   return base::MakeUnique<views::RoundRectInkDropMask>(
       size(), insets, kOverflowButtonCornerRadius);
 }
 
 void OverflowButton::PaintBackground(gfx::Canvas* canvas,
                                      const gfx::Rect& bounds) {
   if (MaterialDesignController::IsShelfMaterial()) {
-    cc::PaintFlags background_paint;
-    background_paint.setFlags(cc::PaintFlags::kAntiAlias_Flag);
-    background_paint.setColor(SkColorSetA(kShelfBaseColor, background_alpha_));
-    canvas->DrawRoundRect(bounds, kOverflowButtonCornerRadius,
-                          background_paint);
+    cc::PaintFlags flags;
+    flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
+    flags.setColor(SkColorSetA(kShelfBaseColor, background_alpha_));
+    canvas->DrawRoundRect(bounds, kOverflowButtonCornerRadius, flags);
   } else {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::ImageSkia* background =
         rb.GetImageNamed(NonMaterialBackgroundImageId()).ToImageSkia();
     canvas->DrawImageInt(*background, bounds.x(), bounds.y());
   }
 }
 
 void OverflowButton::PaintForeground(gfx::Canvas* canvas,
                                      const gfx::Rect& bounds) {
@@ skipping 60 matching lines @@
       bounds =
           gfx::Rect(bounds.x() + (bounds.width() - background->width()) / 2,
                     bounds.y() + kShelfItemInset, background->width(),
                     background->height());
     }
   }
   return bounds;
 }
 
 }  // namespace ash