chrome/browser/ui/app_list/extension_app_item.cc - Issue 2067943004: ARC: Add badge for Chrome hosted Apps if Arc++ is enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2067943004: ARC: Add badge for Chrome hosted Apps if Arc++ is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix the failed unittest. Created 4 years, 6 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

« chrome/browser/extensions/extension_app_icon_loader.cc ('K') | « chrome/browser/extensions/extension_app_icon_loader.cc ('k') | chrome/browser/ui/app_list/extension_app_model_builder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0fa3354391026d16543019b1d5f56b7054444399..44e9bfdce4c592dcbecad36586439488c2eaa13b 100644

--- a/chrome/browser/ui/app_list/extension_app_item.cc

+++ b/chrome/browser/ui/app_list/extension_app_item.cc

@@ -33,6 +33,10 @@

#include "ui/gfx/geometry/rect.h"

#include "ui/gfx/image/canvas_image_source.h"

+#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/extensions/gfx_utils.h"

+#endif

using extensions::Extension;

namespace {

@@ -169,6 +173,10 @@ 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);