ash: Clean up naming of paint-related identifiers

ash/common/shelf/shelf_widget.cc

 // Copyright 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/shelf/shelf_widget.h"
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/app_list_button.h"
@@ skipping 122 matching lines @@
       *rb->GetImageSkiaNamed(IDR_ASH_SHELF_BACKGROUND);
   const bool horizontal = wm_shelf_->IsHorizontalAlignment();
   if (!horizontal) {
     shelf_background = gfx::ImageSkiaOperations::CreateRotatedImage(
         shelf_background, wm_shelf_->GetAlignment() == SHELF_ALIGNMENT_LEFT
                               ? SkBitmapOperations::ROTATION_90_CW
                               : SkBitmapOperations::ROTATION_270_CW);
   }
   const gfx::Rect dock_bounds(
       shelf_widget_->shelf_layout_manager()->dock_bounds());
-  cc::PaintFlags paint;
-  paint.setAlpha(asset_background_alpha_);
+  cc::PaintFlags flags;
+  flags.setAlpha(asset_background_alpha_);
   canvas->DrawImageInt(
       shelf_background, 0, 0, shelf_background.width(),
       shelf_background.height(),
       (horizontal && dock_bounds.x() == 0 && dock_bounds.width() > 0)
           ? dock_bounds.width()
           : 0,
       0, horizontal ? width() - dock_bounds.width() : width(), height(), false,
-      paint);
+      flags);
   if (horizontal && dock_bounds.width() > 0) {
     // The part of the shelf background that is in the corner below the docked
     // windows close to the work area is an arched gradient that blends
     // vertically oriented docked background and horizontal shelf.
     gfx::ImageSkia shelf_corner = *rb->GetImageSkiaNamed(IDR_ASH_SHELF_CORNER);
     if (dock_bounds.x() == 0) {
       shelf_corner = gfx::ImageSkiaOperations::CreateRotatedImage(
           shelf_corner, SkBitmapOperations::ROTATION_90_CW);
     }
     canvas->DrawImageInt(
         shelf_corner, 0, 0, shelf_corner.width(), shelf_corner.height(),
         dock_bounds.x() > 0 ? dock_bounds.x() : dock_bounds.width() - height(),
-        0, height(), height(), false, paint);
+        0, height(), height(), false, flags);
     // The part of the shelf background that is just below the docked windows
     // is drawn using the last (lowest) 1-pixel tall strip of the image asset.
     // This avoids showing the border 3D shadow between the shelf and the
     // dock.
     canvas->DrawImageInt(shelf_background, 0, shelf_background.height() - 1,
                          shelf_background.width(), 1,
                          dock_bounds.x() > 0 ? dock_bounds.x() + height() : 0,
                          0, dock_bounds.width() - height(), height(), false,
-                         paint);
+                         flags);
   }
   gfx::Rect black_rect =
       shelf_widget_->shelf_layout_manager()->SelectValueForShelfAlignment(
           gfx::Rect(0, height() - kNumBlackPixels, width(), kNumBlackPixels),
           gfx::Rect(0, 0, kNumBlackPixels, height()),
           gfx::Rect(width() - kNumBlackPixels, 0, kNumBlackPixels, height()));
   canvas->FillRect(black_rect, SK_ColorBLACK);
 }
 
 bool ShelfWidget::DelegateView::CanActivate() const {
@@ skipping 249 matching lines @@
   if (shelf_view_)
     shelf_view_->UpdateShelfItemBackground(alpha);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 }  // namespace ash