Use a circular profile icon in "open link as user" context menu

chrome/browser/renderer_context_menu/render_view_context_menu.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/renderer_context_menu/render_view_context_menu.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 92 matching lines @@
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/extension.h"
 #include "net/base/escape.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
 #include "third_party/WebKit/public/web/WebMediaPlayerAction.h"
 #include "third_party/WebKit/public/web/WebPluginAction.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/gfx/path.h"
 #include "ui/gfx/text_elider.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
 #endif
 
 #if defined(ENABLE_PRINTING)
 #include "chrome/browser/printing/print_view_manager_common.h"
 #include "components/printing/common/print_messages.h"
 
@@ skipping 255 matching lines @@
 void WriteTextToClipboard(const base::string16& text) {
   ui::ScopedClipboardWriter scw(ui::CLIPBOARD_TYPE_COPY_PASTE);
   scw.WriteText(text);
 }
 
 bool g_custom_id_ranges_initialized = false;
 
 void AddIconToLastMenuItem(gfx::Image icon, ui::SimpleMenuModel* menu) {
   int width = icon.Width();
   int height = icon.Height();
+
+  // Profile avatars are supposed to be displayed with a circular mask, so apply
+  // one.
+  gfx::Path circular_mask;
+  gfx::Canvas canvas(icon.Size(), 1.0f, true);
+  circular_mask.addCircle(SkIntToScalar(width) / 2, SkIntToScalar(height) / 2,
+                          SkIntToScalar(std::min(width, height)) / 2);
+  canvas.ClipPath(circular_mask, true);
+  canvas.DrawImageInt(*icon.ToImageSkia(), 0, 0);
+
   gfx::CalculateFaviconTargetSize(&width, &height);
-  menu->SetIcon(menu->GetItemCount() - 1,
-                profiles::GetSizedAvatarIcon(icon, true, width, height));
+  gfx::Image sized_icon = profiles::GetSizedAvatarIcon(
+      gfx::Image(gfx::ImageSkia(canvas.ExtractImageRep())), true, width,
+      height);
+  menu->SetIcon(menu->GetItemCount() - 1, sized_icon);
 }
 
 void OnProfileCreated(chrome::HostDesktopType desktop_type,
                       const GURL& link_url,
                       const content::Referrer& referrer,
                       Profile* profile,
                       Profile::CreateStatus status) {
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
     Browser* browser = chrome::FindLastActiveWithProfile(profile, desktop_type);
     chrome::NavigateParams nav_params(browser, link_url,
@@ skipping 1723 matching lines @@
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }