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

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/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: Small comment change. 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/installer/setup/install_worker.cc ('K') | « chrome/installer/util/chrome_app_host_distribution.h ('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..9e9325eae1aa24bb968de17fabc2ea66ef813479 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

@@ -139,8 +134,8 @@ bool ChromeAppHostDistribution::CanCreateDesktopShortcuts() {

return true;

}

-int ChromeAppHostDistribution::GetIconIndex() {

- return kAppListIconIndex;

+string16 ChromeAppHostDistribution::GetIconFilename() {

+ return installer::kChromeAppHostExe;

}

bool ChromeAppHostDistribution::GetCommandExecuteImplClsid(