Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Unified Diff: chrome/browser/ui/app_list/extension_app_item.cc

Issue 2787693002: Remove more dead app list code. (Closed)
Patch Set: updated comment Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1412249464ad6f1096d57d2b8f22d7bd46a7ea75..4d4f0dd0ec58c2078233e004d796a54378fbe0ee 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -33,10 +33,7 @@
#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;
@@ -115,8 +112,7 @@ ExtensionAppItem::ExtensionAppItem(
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);
@@ -127,24 +123,6 @@ ExtensionAppItem::ExtensionAppItem(
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;
@@ -167,9 +145,7 @@ void ExtensionAppItem::UpdateIcon() {
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);
@@ -177,11 +153,6 @@ void ExtensionAppItem::UpdateIcon() {
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);
}
@@ -296,11 +267,6 @@ ui::MenuModel* ExtensionAppItem::GetContextMenuModel() {
return context_menu_->GetMenuModel();
}
-void ExtensionAppItem::OnExtensionPreferenceChanged() {
- if (has_overlay_ != NeedsOverlay())
- UpdateIcon();
-}
-
// static
const char ExtensionAppItem::kItemType[] = "ExtensionAppItem";
« no previous file with comments | « chrome/browser/ui/app_list/extension_app_item.h ('k') | chrome/browser/ui/app_list/extension_app_model_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698