[Win] Draw the circular avatar programmatically rather than with a frame.

chrome/browser/ui/views/profiles/profile_chooser_view.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 "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 20 matching lines @@
 #include "components/signin/core/common/profile_management_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/path.h"
+#include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
@@ skipping 99 matching lines @@
                        const gfx::Image& icon,
                        bool is_editing_allowed,
                        const gfx::Rect& bounds)
       : views::ImageView(),
         change_photo_button_(NULL) {
     gfx::Image image = profiles::GetSizedAvatarIcon(
         icon, true, kLargeImageSide, kLargeImageSide);
     SetImage(image.ToImageSkia());
     SetBoundsRect(bounds);
 
-    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-    views::ImageView* frame_overlay = new views::ImageView();
-    frame_overlay->SetImage(rb->GetImageNamed(
-        IDR_ICON_PROFILES_AVATAR_PHOTO_FRAME).ToImageSkia());
-    frame_overlay->SetVerticalAlignment(views::ImageView::CENTER);
-    frame_overlay->SetBoundsRect(bounds);
-    AddChildView(frame_overlay);
+    // Calculate the circular mask that will be used to display the photo.
+    gfx::Point center = bounds.CenterPoint();
+    circular_mask_.addCircle(SkIntToScalar(center.x()),
+                             SkIntToScalar(center.y()),
+                             SkIntToScalar(bounds.width() / 2));
 
     if (!is_editing_allowed)
       return;
 
     set_notify_enter_exit_on_child(true);
 
     // Button overlay that appears when hovering over the image.
     change_photo_button_ = new views::LabelButton(listener, base::string16());
     change_photo_button_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     change_photo_button_->SetBorder(views::Border::NullBorder());
 
     const SkColor kBackgroundColor = SkColorSetARGB(65, 255, 255, 255);
     change_photo_button_->set_background(
         views::Background::CreateSolidBackground(kBackgroundColor));
     change_photo_button_->SetImage(views::LabelButton::STATE_NORMAL,
-        *rb->GetImageSkiaNamed(IDR_ICON_PROFILES_EDIT_CAMERA));
+        *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_ICON_PROFILES_EDIT_CAMERA));
 
     change_photo_button_->SetBoundsRect(bounds);
     change_photo_button_->SetVisible(false);
     AddChildView(change_photo_button_);
   }
 
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+    // Display the profile picture as a circle.
+    canvas->ClipPath(circular_mask_, true);
+    views::ImageView::OnPaint(canvas);
+  }
+
+  virtual void PaintChildren(gfx::Canvas* canvas,
+                     const views::CullSet& cull_set) OVERRIDE {
+    // Display any children (the "change photo" overlay) as a circle.
+    canvas->ClipPath(circular_mask_, true);
+    View::PaintChildren(canvas, cull_set);
+  }
+
   views::LabelButton* change_photo_button() { return change_photo_button_; }
 
  private:
   // views::View:
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE {
     if (change_photo_button_)
       change_photo_button_->SetVisible(true);
   }
 
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE {
     if (change_photo_button_)
       change_photo_button_->SetVisible(false);
   }
 
+  gfx::Path circular_mask_;
+
   // Button that is shown when hovering over the image view. Can be NULL if
   // the photo isn't allowed to be edited (e.g. for guest profiles).
   views::LabelButton* change_photo_button_;
 
   DISALLOW_COPY_AND_ASSIGN(EditableProfilePhoto);
 };
 
 
 // EditableProfileName -------------------------------------------------
 
@@ skipping 1089 matching lines @@
   layout->StartRowWithPadding(
       1, 0, 0, views::kUnrelatedControlVerticalSpacing);
   layout->AddView(end_preview_and_relaunch_button_);
 
   TitleCard* title_card = new TitleCard(
       IDS_PROFILES_END_PREVIEW, this, &end_preview_cancel_button_);
   return TitleCard::AddPaddedTitleCard(
       view, title_card, kFixedAccountRemovalViewWidth);
 }