Show app list items which open in chrome with a tab overlay.

chrome/browser/ui/app_list/extension_app_item.cc

Index: chrome/browser/ui/app_list/extension_app_item.cc
diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
index dfa0fa98fd4e4665c177dc8b7da7c3e93370f780..b85b846a55c73c73a6864523d6d519ae80e4057d 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -25,7 +25,10 @@
 #include "content/public/common/context_menu_params.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.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"
 
 using extensions::Extension;
@@ -212,13 +215,46 @@ void ExtensionAppItem::Move(const ExtensionAppItem* prev,
 }
 
 void ExtensionAppItem::LoadImage(const Extension* extension) {
+  int icon_size = extension_misc::EXTENSION_ICON_MEDIUM;
+  if (HasOverlay())
+    icon_size = extension_misc::EXTENSION_ICON_SMALL;
+
   icon_.reset(new extensions::IconImage(
       extension,
       extension->icons(),
-      extension_misc::EXTENSION_ICON_MEDIUM,
+      icon_size,
       Extension::GetDefaultIcon(true),
       this));
-  SetIcon(icon_->image_skia());
+  SetIconWithOverlay(icon_->image_skia());
+}
+
+bool ExtensionAppItem::HasOverlay() {
+  return !GetExtension()->is_platform_app();
+}
+
+void ExtensionAppItem::SetIconWithOverlay(const gfx::ImageSkia& icon) {
+  using extension_misc::EXTENSION_ICON_SMALL;
+  using extension_misc::EXTENSION_ICON_MEDIUM;
+
+  if (!HasOverlay()) {
+    SetIcon(icon);
+    return;
+  }
+
+  const int kIconOffset = (EXTENSION_ICON_MEDIUM - EXTENSION_ICON_SMALL) / 2;
+
+  // The tab overlay is not vertically symmetric, to position the app in the
+  // middle of the overlay we need a slight adjustment.
+  const int kVerticalAdjust = 2;
+  gfx::Canvas icon_canvas(gfx::Size(EXTENSION_ICON_MEDIUM,
+                                    EXTENSION_ICON_MEDIUM),
+                          ui::SCALE_FACTOR_100P, false);

[xiyuan, 2012/12/12 17:12:43]

This does not work properly on HiDPI. I think you need to create the badged
image using CanvasImageSource. One example of such use is BadgeImageSource in
chrome/browser/ui/views/toolbar_view.cc

https://cs.corp.google.com/#chrome/src/chrome/browser/ui/views/toolbar_view.c...

[benwells, 2012/12/13 06:38:27]

Yep, thanks for that. For now I'm just going to have this on Windows to get some
feedback. I've been a bit worried about this suddenly changing ChromeOS just
before M25 branch.

If this design is good I can update to support HiDPI before enabling for
ChromeOS. It looks pretty simple (thanks for the link).

[xiyuan, 2012/12/13 17:26:54]

CanvasImageSource is cross platform and we should use that on Windows too. Let's
at least put a TODO here.

+  icon_canvas.DrawImageInt(icon, kIconOffset, kIconOffset + kVerticalAdjust);
+  icon_canvas.DrawImageInt(
+      *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_APP_LIST_TAB_OVERLAY),
+      0, 0);

[xiyuan, 2012/12/12 17:12:43]

Should we draw the tab first since it is bigger and more like a frame for the
icon?

[benwells, 2012/12/13 06:38:27]

I've switched it around. It does make a slight difference as  I don't think the
inside of tab is completely transparent. By drawing the icon last it doesn't get
faded out by this transparency.

+  SetIcon(gfx::ImageSkia(icon_canvas.ExtractImageRep()));
 }
 
 void ExtensionAppItem::ShowExtensionOptions() {
@@ -254,7 +290,7 @@ void ExtensionAppItem::StartExtensionUninstall() {
 void ExtensionAppItem::OnExtensionIconImageChanged(
     extensions::IconImage* image) {
   DCHECK(icon_.get() == image);
-  SetIcon(icon_->image_skia());
+  SetIconWithOverlay(icon_->image_skia());
 }
 
 bool ExtensionAppItem::IsItemForCommandIdDynamic(int command_id) const {