From 7eec797cfe750eae6645705958005e6791596a0e Mon Sep 17 00:00:00 2001 From: "grt@chromium.org" Date: Mon, 17 Oct 2011 16:56:58 +0000 Subject: Show canary icon in Programs and Features (Add/Remove Programs) control panel. BUG=100201 TEST=install canary, note that the uninstall entry has the correct icon. R=robertshield@chromium.org Review URL: http://codereview.chromium.org/8321004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105825 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/setup/install_worker.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/installer/setup') diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index 8fe4818..af8f919 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -182,11 +182,11 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state, true); // DisplayIcon, NoModify and NoRepair - FilePath chrome_icon(install_path.Append(installer::kChromeExe)); - ShellUtil::GetChromeIcon(product.distribution(), chrome_icon.value()); + std::wstring chrome_icon = ShellUtil::GetChromeIcon( + product.distribution(), + install_path.Append(installer::kChromeExe).value()); install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg, - L"DisplayIcon", chrome_icon.value(), - true); + L"DisplayIcon", chrome_icon, true); install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg, L"NoModify", static_cast(1), true); -- cgit v1.1