Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4922)

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: Clean up to get Program and Features uninstall icon to work more generally. 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
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..860baf57a6d85418f86fd3c66845452cb79e07ec 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
+ BrowserDistribution* dist = product.distribution();
string16 chrome_icon = ShellUtil::GetChromeIcon(
grt (UTC plus 2) 2012/11/13 16:19:32 why not just ShellUtil::GetChromeIcon(dist).value(
huangs 2012/11/13 20:41:54 This would be nice, but there are flows where chro
- product.distribution(),
- install_path.Append(installer::kChromeExe).value());
+ dist, install_path.Append(dist->GetIconExe()).value());
erikwright (departed) 2012/11/13 14:55:34 gab: This callsite is the main motivation for the
huangs 2012/11/13 20:41:54 Pending decision.
install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
L"DisplayIcon", chrome_icon, true);
install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,

Powered by Google App Engine
This is Rietveld 408576698