diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:56:58 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:56:58 +0000 |
| commit | 7eec797cfe750eae6645705958005e6791596a0e (patch) | |
| tree | 3e2dac477762157c6082140bc5096ed36f6f7ef7 /chrome/installer/setup | |
| parent | f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4 (diff) | |
| download | chromium_src-7eec797cfe750eae6645705958005e6791596a0e.zip chromium_src-7eec797cfe750eae6645705958005e6791596a0e.tar.gz chromium_src-7eec797cfe750eae6645705958005e6791596a0e.tar.bz2 | |
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
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/install_worker.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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<DWORD>(1), true); |