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

Unified Diff: chrome/installer/setup/install_worker.cc

Issue 8321004: Show canary icon in Programs and Features (Add/Remove Programs) control panel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 8fe481852d5e5d357fde113950f0c8bb22c66985..af8f919b34866f234ef3f8da68fbded854d9f791 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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698