chrome/browser/ui/app_list/search/extension_app_result.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/search/extension_app_result.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: Address xiyuan@'s comment. Rebase 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

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

Index: chrome/browser/ui/app_list/search/extension_app_result.cc

diff --git a/chrome/browser/ui/app_list/search/extension_app_result.cc b/chrome/browser/ui/app_list/search/extension_app_result.cc

index 964980d7a93012ca3b9e39026438e819d56333c5..877fc96087065a3d1b3f5d4f30745e8ed43e440d 100644

--- a/chrome/browser/ui/app_list/search/extension_app_result.cc

+++ b/chrome/browser/ui/app_list/search/extension_app_result.cc

@@ -24,6 +24,10 @@

#include "ui/gfx/color_utils.h"

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

+#if defined(OS_CHROMEOS)

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

+#endif

namespace app_list {

ExtensionAppResult::ExtensionAppResult(Profile* profile,

@@ -137,6 +141,10 @@ bool ExtensionAppResult::RunExtensionEnableFlow() {

void ExtensionAppResult::UpdateIcon() {

gfx::ImageSkia icon = icon_->image_skia();

+#if defined(OS_CHROMEOS)

+ extensions::util::MaybeApplyChromeBadge(profile(), app_id(), &icon);

+#endif

if (!extensions::util::IsAppLaunchable(app_id(), profile())) {

const color_utils::HSL shift = {-1, 0, 0.6};

icon = gfx::ImageSkiaOperations::CreateHSLShiftedImage(icon, shift);