Rename paint data structures

ash/common/shelf/app_list_button.cc

 // Copyright 2014 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/app_list_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 146 matching lines @@
     PaintAppListButton(canvas, foreground_image);
   }
 
   views::Painter::PaintFocusPainter(this, canvas, focus_painter());
 }
 
 void AppListButton::PaintMd(gfx::Canvas* canvas) {
   gfx::PointF circle_center(GetCenterPoint());
 
   // Paint the circular background.
-  SkPaint bg_paint;
+  cc::PaintFlags bg_paint;
   bg_paint.setColor(SkColorSetA(kShelfBaseColor, background_alpha_));
-  bg_paint.setFlags(SkPaint::kAntiAlias_Flag);
-  bg_paint.setStyle(SkPaint::kFill_Style);
+  bg_paint.setFlags(cc::PaintFlags::kAntiAlias_Flag);
+  bg_paint.setStyle(cc::PaintFlags::kFill_Style);
   canvas->DrawCircle(circle_center, kAppListButtonRadius, bg_paint);
 
   // Paint a white ring as the foreground. The ceil/dsf math assures that the
   // ring draws sharply and is centered at all scale factors.
   const float kRingOuterRadiusDp = 7.f;
   const float kRingThicknessDp = 1.5f;
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float dsf = canvas->UndoDeviceScaleFactor();
   circle_center.Scale(dsf);
 
-  SkPaint fg_paint;
-  fg_paint.setFlags(SkPaint::kAntiAlias_Flag);
-  fg_paint.setStyle(SkPaint::kStroke_Style);
+  cc::PaintFlags fg_paint;
+  fg_paint.setFlags(cc::PaintFlags::kAntiAlias_Flag);
+  fg_paint.setStyle(cc::PaintFlags::kStroke_Style);
   fg_paint.setColor(kShelfIconColor);
   const float thickness = std::ceil(kRingThicknessDp * dsf);
   const float radius = std::ceil(kRingOuterRadiusDp * dsf) - thickness / 2;
   fg_paint.setStrokeWidth(thickness);
   // Make sure the center of the circle lands on pixel centers.
   canvas->DrawCircle(circle_center, radius, fg_paint);
 }
 
 void AppListButton::PaintAppListButton(gfx::Canvas* canvas,
                                        const gfx::ImageSkia& foreground_image) {
@@ skipping 109 matching lines @@
     return gfx::Point(x_mid, x_mid);
   } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
     return gfx::Point(y_mid, y_mid);
   } else {
     DCHECK_EQ(alignment, SHELF_ALIGNMENT_LEFT);
     return gfx::Point(width() - y_mid, y_mid);
   }
 }
 
 }  // namespace ash