Add new overlay for v1 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/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_prefs.h"
@@ skipping 99 matching lines @@
   }
 
   Profile* profile_;
   std::string extension_id_;
   AppListControllerDelegate* controller_;
   scoped_ptr<ExtensionUninstallDialog> dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionUninstaller);
 };
 
-class TabOverlayImageSource : public gfx::CanvasImageSource {
+// Overlays a shortcut icon over the bottom left corner of a given image.
+class ShortcutOverlayImageSource : public gfx::CanvasImageSource {
  public:
-  TabOverlayImageSource(const gfx::ImageSkia& icon, const gfx::Size& size)
-      : gfx::CanvasImageSource(size, false),
+  explicit ShortcutOverlayImageSource(const gfx::ImageSkia& icon)
+      : gfx::CanvasImageSource(icon.size(), false),
         icon_(icon) {
-    if (!icon_.isNull()) {
-      DCHECK_EQ(extension_misc::EXTENSION_ICON_SMALL, icon_.width());
-      DCHECK_EQ(extension_misc::EXTENSION_ICON_SMALL, icon_.height());
-    }
   }
-  virtual ~TabOverlayImageSource() {}
+  virtual ~ShortcutOverlayImageSource() {}
 
  private:
   // gfx::CanvasImageSource overrides:
   virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
-    using extension_misc::EXTENSION_ICON_SMALL;
-    using extension_misc::EXTENSION_ICON_MEDIUM;
+    canvas->DrawImageInt(icon_, 0, 0);
 
-    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 = 4;
-    canvas->DrawImageInt(
-        *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-            IDR_APP_LIST_TAB_OVERLAY),
-        0, 0);
-    canvas->DrawImageInt(icon_, kIconOffset, kIconOffset + kVerticalAdjust);
+    // Draw the overlay in the bottom left corner of the icon.
+    const gfx::ImageSkia& overlay = *ui::ResourceBundle::GetSharedInstance().
+        GetImageSkiaNamed(IDR_APP_LIST_TAB_OVERLAY);
+    canvas->DrawImageInt(overlay, 0, icon_.height() - overlay.height());
   }
 
   gfx::ImageSkia icon_;
 
-  DISALLOW_COPY_AND_ASSIGN(TabOverlayImageSource);
+  DISALLOW_COPY_AND_ASSIGN(ShortcutOverlayImageSource);
 };
 
 extensions::ExtensionPrefs::LaunchType GetExtensionLaunchType(
     Profile* profile,
     const Extension* extension) {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   return service->extension_prefs()->
       GetLaunchType(extension, extensions::ExtensionPrefs::LAUNCH_DEFAULT);
 }
@@ skipping 110 matching lines @@
   // 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::UpdateIcon() {
   if (!GetExtension()) {
     gfx::ImageSkia icon = installing_icon_;
-    if (HasOverlay()) {
-      // The tab overlay requires icons of a certain size.
-      gfx::Size small_size(extension_misc::EXTENSION_ICON_SMALL,
-                           extension_misc::EXTENSION_ICON_SMALL);
-      icon = gfx::ImageSkiaOperations::CreateResizedImage(
-          icon, skia::ImageOperations::RESIZE_GOOD, small_size);
-
-      gfx::Size size(extension_misc::EXTENSION_ICON_MEDIUM,
-                     extension_misc::EXTENSION_ICON_MEDIUM);
-      icon = gfx::ImageSkia(new TabOverlayImageSource(icon, size), size);
-    }
+    if (HasOverlay())
+      icon = gfx::ImageSkia(new ShortcutOverlayImageSource(icon), icon.size());
     SetIcon(icon, !HasOverlay());
     return;
   }
   gfx::ImageSkia icon = icon_->image_skia();
 
   const ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   const bool enabled = service->IsExtensionEnabledForLauncher(extension_id_);
   if (!enabled) {
     const color_utils::HSL shift = {-1, 0, 0.6};
     icon = gfx::ImageSkiaOperations::CreateHSLShiftedImage(icon, shift);
   }
 
-  if (HasOverlay()) {
-    const gfx::Size size(extension_misc::EXTENSION_ICON_MEDIUM,
-                         extension_misc::EXTENSION_ICON_MEDIUM);
-    icon = gfx::ImageSkia(new TabOverlayImageSource(icon, size), size);
-  }
+  if (HasOverlay())
+    icon = gfx::ImageSkia(new ShortcutOverlayImageSource(icon), icon.size());
 
   SetIcon(icon, !HasOverlay());
 }
 
 const Extension* ExtensionAppItem::GetExtension() const {
   const ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   const Extension* extension = service->GetInstalledExtension(extension_id_);
   return extension;
 }
 
 void ExtensionAppItem::LoadImage(const Extension* extension) {
   int icon_size = extension_misc::EXTENSION_ICON_MEDIUM;

[xiyuan, 2013/04/09 18:06:27]

nit: get rid of |icon_size| and use extension_misc::EXTENSION_ICON_MEDIUM
directly.

[koz (OOO until 15th September), 2013/04/09 18:09:32]

Done.

-  if (HasOverlay())
-    icon_size = extension_misc::EXTENSION_ICON_SMALL;
-
   icon_.reset(new extensions::IconImage(
       profile_,
       extension,
       extensions::IconsInfo::GetIcons(extension),
       icon_size,
       extensions::IconsInfo::GetDefaultAppIcon(),
       this));
   UpdateIcon();
 }
 
@@ skipping 268 matching lines @@
     context_menu_model_->AddItemWithStringId(DETAILS,
                                              IDS_NEW_TAB_APP_DETAILS);
     context_menu_model_->AddItemWithStringId(UNINSTALL,
                                              is_platform_app_ ?
                                                  IDS_APP_LIST_UNINSTALL_ITEM :
                                                  IDS_EXTENSIONS_UNINSTALL);
   }
 
   return context_menu_model_.get();
 }