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

Unified Diff: ash/common/system/user/rounded_image_view.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: Re-add ios changes 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
Index: ash/common/system/user/rounded_image_view.cc
diff --git a/ash/common/system/user/rounded_image_view.cc b/ash/common/system/user/rounded_image_view.cc
index b6fa23ccd17256035f00dba89b6b818a5ec4f9f0..d90df62703f1150bea989a84d8f087f44f9abfce 100644
--- a/ash/common/system/user/rounded_image_view.cc
+++ b/ash/common/system/user/rounded_image_view.cc
@@ -6,7 +6,6 @@
#include "ash/common/material_design/material_design_controller.h"
#include "skia/ext/image_operations.h"
-#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image_skia_operations.h"
@@ -64,7 +63,7 @@ void RoundedImageView::OnPaint(gfx::Canvas* canvas) {
SkIntToScalar(corner_radius_[3]), SkIntToScalar(corner_radius_[3])};
SkPath path;
path.addRoundRect(gfx::RectToSkRect(image_bounds), kRadius);
- SkPaint paint;
+ cc::PaintFlags paint;
paint.setAntiAlias(true);
const bool grayscale =
!active_user_ && !MaterialDesignController::IsSystemTrayMenuMaterial();

Powered by Google App Engine
This is Rietveld 408576698