Round app icon corners for bookmark apps in the launcher.

chrome/browser/ui/app_list/extension_app_item.cc

 // Copyright (c) 2012 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/app_list/extension_app_item.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 48 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ShortcutOverlayImageSource);
 };
 
 extensions::AppSorting* GetAppSorting(Profile* profile) {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   return service->extension_prefs()->app_sorting();
 }
 
+// Returns the given |icon| with rounded corners.
+gfx::ImageSkia GetRoundedIcon(gfx::ImageSkia icon) {
+  // The radius used to round the app icon.
+  const size_t kRoundingRadius = 2;
+
+  scoped_ptr<SkCanvas> canvas(
+      skia::CreateBitmapCanvas(icon.width(), icon.height(), false));
+  DCHECK(canvas);
+  canvas->drawBitmap(*icon.bitmap(), 0, 0);
+
+  scoped_ptr<SkCanvas> masking_canvas(
+      skia::CreateBitmapCanvas(icon.width(), icon.height(), false));
+  DCHECK(masking_canvas);
+
+  SkPaint opaque_paint;
+  opaque_paint.setColor(SK_ColorWHITE);
+  opaque_paint.setFlags(SkPaint::kAntiAlias_Flag);
+  masking_canvas->drawRoundRect(
+    SkRect::MakeWH(icon.width(), icon.height()),
+    kRoundingRadius, kRoundingRadius, opaque_paint);
+
+  SkPaint masking_paint;
+  masking_paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
+  canvas->drawBitmap(
+      masking_canvas->getDevice()->accessBitmap(false), 0, 0, &masking_paint);
+
+  return gfx::ImageSkia::CreateFrom1xBitmap(
+      canvas->getDevice()->accessBitmap(false));
+}
+
 const color_utils::HSL shift = {-1, 0, 0.6};
 
 }  // namespace
 
 ExtensionAppItem::ExtensionAppItem(
     Profile* profile,
     const app_list::AppListSyncableService::SyncItem* sync_item,
     const std::string& extension_id,
     const std::string& extension_name,
     const gfx::ImageSkia& installing_icon,
@@ skipping 53 matching lines @@
   gfx::ImageSkia icon = icon_->image_skia();
 
   const ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   const bool enabled = extension_util::IsAppLaunchable(extension_id_, service);
   if (!enabled) {
     const color_utils::HSL shift = {-1, 0, 0.6};
     icon = gfx::ImageSkiaOperations::CreateHSLShiftedImage(icon, shift);
   }
 
+  if (GetExtension()->from_bookmark())
+    icon = GetRoundedIcon(icon);
+
   if (HasOverlay())
     icon = gfx::ImageSkia(new ShortcutOverlayImageSource(icon), icon.size());
 
   SetIcon(icon, !HasOverlay());
 }
 
 void ExtensionAppItem::Move(const ExtensionAppItem* prev,
                             const ExtensionAppItem* next) {
   if (!prev && !next)
     return;  // No reordering necessary
@@ skipping 139 matching lines @@
   const syncer::StringOrdinal& launch =
      GetAppSorting(profile_)->GetAppLaunchOrdinal(extension_id_);
   set_position(syncer::StringOrdinal(
       page.ToInternalValue() + launch.ToInternalValue()));
 }
 
 AppListControllerDelegate* ExtensionAppItem::GetController() {
   return AppListService::Get(chrome::GetActiveDesktop())->
       GetControllerDelegate();
 }