chrome/installer/util/chrome_app_host_distribution.cc - Issue 11359133: Add default icon to app_host.exe, and use it in shortcuts during installation.

Unified Diff: chrome/installer/util/chrome_app_host_distribution.cc

Issue 11359133: Add default icon to app_host.exe, and use it in shortcuts during installation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 1 month 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/app_host/app_host.rc ('K') | « chrome/browser/extensions/app_host/app_host.rc ('k') | chrome/installer/util/chrome_app_host_operations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/chrome_app_host_distribution.cc

diff --git a/chrome/installer/util/chrome_app_host_distribution.cc b/chrome/installer/util/chrome_app_host_distribution.cc

index 69eba10625936f6c9a5cdde40b374efb59130c7e..20fe285800c197be3b229ff843628e6a08a69348 100644

--- a/chrome/installer/util/chrome_app_host_distribution.cc

+++ b/chrome/installer/util/chrome_app_host_distribution.cc

@@ -22,11 +22,6 @@

namespace {

-#if defined(GOOGLE_CHROME_BUILD)

-const int kAppListIconIndex = 5;

-#else

-const int kAppListIconIndex = 1;

-#endif

const wchar_t kChromeAppHostGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}";

} // namespace

@@ -140,7 +135,7 @@ bool ChromeAppHostDistribution::CanCreateDesktopShortcuts() {

}

int ChromeAppHostDistribution::GetIconIndex() {

- return kAppListIconIndex;

+ return 0;

gab 2012/11/09 19:29:28 Same icon for Chrome and Chromium builds?!

huangs 2012/11/12 20:00:30 Yes; this was the previous behaviour. However, I'

gab 2012/11/14 21:34:34 Hmmm... this wasn't the previous behavior... the d

gab 2012/11/14 23:47:07 Ping.

huangs 2012/11/15 00:06:38 By behaviour, I meant end result, i.e., the icon.

}

bool ChromeAppHostDistribution::GetCommandExecuteImplClsid(