chrome/installer/setup/install_worker.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/setup/install_worker.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: Fix .gypi for new file. 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/shell_integration_win.cc ('K') | « chrome/chrome_browser_extensions.gypi ('k') | chrome/installer/util/browser_distribution.h » ('j') | chrome/installer/util/browser_distribution.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/setup/install_worker.cc

diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc

index 2ef5660e3141f79a088857e02643586f4d49fd5a..aa9226c3b4d0036722c5350bb5a7dd81d1272e5e 100644

--- a/chrome/installer/setup/install_worker.cc

+++ b/chrome/installer/setup/install_worker.cc

@@ -621,12 +621,10 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state,

install_path.value(),

true);

- // TODO(huangs): Generalize this, so app_host.exe can get its own icon,

- // and not rely on chrome.exe's.

// DisplayIcon, NoModify and NoRepair

gab 2012/11/14 18:47:32 I don't feel this remaining one line comment adds

huangs 2012/11/14 20:35:55 Done.

- string16 chrome_icon = ShellUtil::GetChromeIcon(

- product.distribution(),

- install_path.Append(installer::kChromeExe).value());

+ BrowserDistribution* dist = product.distribution();

+ string16 chrome_icon = ShellUtil::GetResourceString(

+ install_path.Append(dist->GetIconFile()).value(), dist->GetIconIndex());

install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,

L"DisplayIcon", chrome_icon, true);

install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,