Remove more dead app list code.

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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
@@ skipping 15 matching lines @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/manifest_url_handlers.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/skia_util.h"
-
-#if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/gfx_utils.h"
-#endif
 
 using extensions::Extension;
 
 namespace {
 
 // Overlays a shortcut icon over the bottom left corner of a given image.
 class ShortcutOverlayImageSource : public gfx::CanvasImageSource {
  public:
   explicit ShortcutOverlayImageSource(const gfx::ImageSkia& icon)
       : gfx::CanvasImageSource(icon.size(), false),
@@ skipping 58 matching lines @@
     Profile* profile,
     const app_list::AppListSyncableService::SyncItem* sync_item,
     const std::string& extension_id,
     const std::string& extension_name,
     const gfx::ImageSkia& installing_icon,
     bool is_platform_app)
     : ChromeAppListItem(profile, extension_id),
       extension_enable_flow_controller_(NULL),
       extension_name_(extension_name),
       installing_icon_(CreateDisabledIcon(installing_icon)),
-      is_platform_app_(is_platform_app),
-      has_overlay_(false) {
+      is_platform_app_(is_platform_app) {
   Reload();
   if (sync_item && sync_item->item_ordinal.IsValid())
     UpdateFromSync(sync_item);
   else
     SetDefaultPositionIfApplicable();
 }
 
 ExtensionAppItem::~ExtensionAppItem() {
 }
 
-bool ExtensionAppItem::NeedsOverlay() const {
-#if defined(OS_CHROMEOS)
-  // The overlay is disabled completely in ChromeOS.
-  return false;
-#endif
-
-  extensions::LaunchType launch_type = GetExtension()
-      ? extensions::GetLaunchType(extensions::ExtensionPrefs::Get(profile()),
-                                  GetExtension())
-      : extensions::LAUNCH_TYPE_WINDOW;
-
-  // The overlay icon is disabled for hosted apps in windowed mode with
-  // bookmark apps enabled.
-  return !is_platform_app_ && extension_id() != extension_misc::kChromeAppId &&
-         (!extensions::util::IsNewBookmarkAppsEnabled() ||
-          launch_type != extensions::LAUNCH_TYPE_WINDOW);
-}
-
 void ExtensionAppItem::Reload() {
   const Extension* extension = GetExtension();
   bool is_installing = !extension;
   SetIsInstalling(is_installing);
   if (is_installing) {
     SetName(extension_name_);
     UpdateIcon();
     return;
   }
   SetNameAndShortName(extension->name(), extension->short_name());
   LoadImage(extension);
 }
 
 void ExtensionAppItem::UpdateIcon() {
   gfx::ImageSkia icon = installing_icon_;
 
   // Use the app icon if the app exists. Turn the image greyscale if the app is
   // not launchable.
   if (GetExtension() && icon_) {
     icon = icon_->image_skia();
     const bool enabled = extensions::util::IsAppLaunchable(extension_id(),
                                                            profile());
-#if defined(OS_CHROMEOS)
     extensions::util::MaybeApplyChromeBadge(profile(), id(), &icon);
-#endif
 
     if (!enabled)
       icon = CreateDisabledIcon(icon);
 
     if (GetExtension()->from_bookmark())
       icon = gfx::ImageSkia(new RoundedCornersImageSource(icon), icon.size());
   }
-  // Paint the shortcut overlay if necessary.
-  has_overlay_ = NeedsOverlay();
-  if (has_overlay_)
-    icon = gfx::ImageSkia(new ShortcutOverlayImageSource(icon), icon.size());
-
   SetIcon(icon);
 }
 
 const Extension* ExtensionAppItem::GetExtension() const {
   const extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(profile());
   const Extension* extension = registry->GetInstalledExtension(
       extension_id());
   return extension;
 }
@@ skipping 94 matching lines @@
 
 ui::MenuModel* ExtensionAppItem::GetContextMenuModel() {
   context_menu_.reset(new app_list::ExtensionAppContextMenu(this,
                                                             profile(),
                                                             extension_id(),
                                                             GetController()));
   context_menu_->set_is_platform_app(is_platform_app_);
   return context_menu_->GetMenuModel();
 }
 
-void ExtensionAppItem::OnExtensionPreferenceChanged() {
-  if (has_overlay_ != NeedsOverlay())
-    UpdateIcon();
-}
-
 // static
 const char ExtensionAppItem::kItemType[] = "ExtensionAppItem";
 
 const char* ExtensionAppItem::GetItemType() const {
   return ExtensionAppItem::kItemType;
 }
 
 void ExtensionAppItem::ExecuteLaunchCommand(int event_flags) {
   Launch(event_flags);
 }