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 cef81547ea855374a7c7a8f40b53f38f39272903..4e6b1646cfd7d44de0501ac53cc6f7a1b036a503 100644 |
--- a/ash/common/system/user/rounded_image_view.cc |
+++ b/ash/common/system/user/rounded_image_view.cc |
@@ -20,14 +20,13 @@ RoundedImageView::RoundedImageView(int corner_radius) { |
RoundedImageView::~RoundedImageView() {} |
-void RoundedImageView::SetImage(const gfx::ImageSkia& img, |
+void RoundedImageView::SetImage(const gfx::ImageSkia& image, |
const gfx::Size& size) { |
- image_ = img; |
image_size_ = size; |
// Try to get the best image quality for the avatar. |
- resized_ = gfx::ImageSkiaOperations::CreateResizedImage( |
- image_, skia::ImageOperations::RESIZE_BEST, size); |
+ resized_image_ = gfx::ImageSkiaOperations::CreateResizedImage( |
+ image, skia::ImageOperations::RESIZE_BEST, size); |
if (GetWidget() && visible()) { |
PreferredSizeChanged(); |
SchedulePaint(); |
@@ -63,8 +62,8 @@ void RoundedImageView::OnPaint(gfx::Canvas* canvas) { |
path.addRoundRect(gfx::RectToSkRect(image_bounds), kRadius); |
cc::PaintFlags flags; |
flags.setAntiAlias(true); |
- canvas->DrawImageInPath(resized_, image_bounds.x(), image_bounds.y(), path, |
- flags); |
+ canvas->DrawImageInPath(resized_image_, image_bounds.x(), image_bounds.y(), |
+ path, flags); |
} |
} // namespace tray |