summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup
diff options
context:
space:
mode:
authorrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-28 23:27:49 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-28 23:27:49 +0000
commit236ef33ebbb7aae61d5f36d8dc4570674819c810 (patch)
tree9cf6519ce421d317cea1e37ac343ad17cd64db2c /chrome/installer/setup
parent42760abfbb3ef72fa2edf6e9720566c29e8557e8 (diff)
downloadchromium_src-236ef33ebbb7aae61d5f36d8dc4570674819c810.zip
chromium_src-236ef33ebbb7aae61d5f36d8dc4570674819c810.tar.gz
chromium_src-236ef33ebbb7aae61d5f36d8dc4570674819c810.tar.bz2
Rename uninstall link from Chrome to localized "Google Chrome" string (value of reg key - DisplayName). Keep the uninstall key itself as Google Chrome in all languages as it is not visible to the user and helps in deleting the key in case user changes the system locale after installing Chrome.
BUG=1293755 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
-rw-r--r--chrome/installer/setup/install.cc11
1 files changed, 7 insertions, 4 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,