Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: ash/common/shelf/app_list_button.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: DrawingDisplayItem Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/frame/default_header_painter.cc ('k') | ash/common/shelf/overflow_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/app_list_button.cc
diff --git a/ash/common/shelf/app_list_button.cc b/ash/common/shelf/app_list_button.cc
index 4c76577392da64ed6a826c9ff941693830033cba..df9544c3beb0b1baae8ff2f7ad6ab3c7e48df40b 100644
--- a/ash/common/shelf/app_list_button.cc
+++ b/ash/common/shelf/app_list_button.cc
@@ -164,10 +164,10 @@ 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
@@ -178,9 +178,9 @@ void AppListButton::PaintMd(gfx::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;
« no previous file with comments | « ash/common/frame/default_header_painter.cc ('k') | ash/common/shelf/overflow_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698