diff options
| -rw-r--r-- | chrome/installer/setup/install.cc | 11 | ||||
| -rw-r--r-- | chrome/installer/util/util_constants.cc | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 5cd0f22..e06f936 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -39,6 +39,7 @@ #include "chrome/installer/util/create_reg_key_work_item.h" #include "chrome/installer/util/delete_tree_work_item.h" #include "chrome/installer/util/install_util.h" +#include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/set_reg_value_work_item.h" @@ -47,6 +48,8 @@ #include "chrome/installer/util/version.h" #include "chrome/installer/util/work_item_list.h" +#include "setup_strings.h" + namespace { std::wstring AppendPath(const std::wstring parent_path, const std::wstring path) { @@ -74,11 +77,11 @@ void AddUninstallShortcutWorkItems(HKEY reg_root, // Create DisplayName, UninstallString and InstallLocation keys install_list->AddCreateRegKeyWorkItem(reg_root, installer_util::kUninstallRegPath); + const std::wstring& product_name = + installer_util::GetLocalizedString(IDS_PRODUCT_NAME_BASE); install_list->AddSetRegValueWorkItem( - reg_root, - installer_util::kUninstallRegPath, - installer_util::kUninstallDisplayNameField, - installer_util::kChrome, true); + reg_root, installer_util::kUninstallRegPath, + installer_util::kUninstallDisplayNameField, product_name, true); install_list->AddSetRegValueWorkItem(reg_root, installer_util::kUninstallRegPath, installer_util::kUninstallStringField, diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc index 9833671..d008647 100644 --- a/chrome/installer/util/util_constants.cc +++ b/chrome/installer/util/util_constants.cc @@ -76,7 +76,7 @@ const wchar_t kPublisherName[] = L"Google"; const wchar_t kApplicationName[] = L"Google Chrome"; const wchar_t kSetupExe[] = L"setup.exe"; -const wchar_t kUninstallRegPath[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Chrome"; +const wchar_t kUninstallRegPath[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome"; const wchar_t kUninstallStringField[] = L"UninstallString"; const wchar_t kUninstallDisplayNameField[] = L"DisplayName"; } // namespace installer_util |