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

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 "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #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;
 
 namespace {
 
 enum CommandId {
   LAUNCH_NEW = 100,
   TOGGLE_PIN,
   CREATE_SHORTCUTS,
@@ skipping 166 matching lines @@
   // Otherwise, go with |next|. This is okay because app list does not split
   // page based ntp page ordinal.
   // TODO(xiyuan): Revisit this when implementing paging support.
   GetExtensionSorting(profile_)->SetPageOrdinal(extension_id_, prev_page);
   service->OnExtensionMoved(extension_id_,
                             prev->extension_id(),
                             std::string());
 }
 
 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() {
   const Extension* extension = GetExtension();
   if (!extension)
     return;
 
   chrome::NavigateParams params(profile_,
                                 extension->options_url(),
                                 content::PAGE_TRANSITION_LINK);
@@ skipping 15 matching lines @@
   // ExtensionUninstall deletes itself when done or aborted.
   ExtensionUninstaller* uninstaller = new ExtensionUninstaller(profile_,
                                                                extension_id_,
                                                                controller_);
   uninstaller->Run();
 }
 
 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 {
   return command_id == TOGGLE_PIN || command_id == LAUNCH_NEW;
 }
 
 string16 ExtensionAppItem::GetLabelForCommandId(int command_id) const {
   if (command_id == TOGGLE_PIN) {
     return controller_->IsAppPinned(extension_id_) ?
         l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_UNPIN) :
@@ skipping 187 matching lines @@
     }
 
     context_menu_model_->AddItemWithStringId(UNINSTALL,
                                              extension->is_platform_app() ?
                                                  IDS_APP_LIST_UNINSTALL_ITEM :
                                                  IDS_EXTENSIONS_UNINSTALL);
   }
 
   return context_menu_model_.get();
 }