From 4880adb3346faa91feea9d8ecfecc4ef499bf7fc Mon Sep 17 00:00:00 2001 From: "rahulk@google.com" Date: Tue, 19 Aug 2008 18:04:51 +0000 Subject: Refactor localized strings used in installer for Chromium/Google Chrome separation (see other change out for review - chromium_1). - Rename resources files as util_strings.* as they will be used by classes in util project. - Instead of directly accessing resource, chrome.dll and setup.exe will get the resource from helper class in util project. Remove references to header file from projects. - The resources still need be bundled in the binary so directly include util_strings.rc in resource file. - Add another string "Google Inc" in resource file to use as Publisher name. - Remove uninstall URL from resource file. This URL is not going to be localized, we are manually appending language parameter to it. BUG=1296800 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1044 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/setup/install.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'chrome/installer/setup/install.cc') diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 57efed4..8d6f044 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -49,7 +49,7 @@ #include "chrome/installer/util/version.h" #include "chrome/installer/util/work_item_list.h" -#include "setup_strings.h" +#include "installer_util_strings.h" namespace { std::wstring AppendPath(const std::wstring parent_path, @@ -214,10 +214,10 @@ bool installer::InstallNewVersion(const std::wstring& exe_path, // add shortcut in Control Panel->Add/Remove Programs. AddInstallerCopyTasks(exe_path, archive_path, temp_dir, install_path, new_version.GetString(), install_list.get()); - const std::wstring& product_name = - installer_util::GetLocalizedString(IDS_PRODUCT_NAME_BASE); - AddUninstallShortcutWorkItems(reg_root, exe_path, install_path, product_name, - new_version.GetString(), install_list.get()); + BrowserDistribution* dist = BrowserDistribution::GetDistribution(); + std::wstring product_name = dist->GetApplicationName(); + AddUninstallShortcutWorkItems(reg_root, exe_path, install_path, + product_name, new_version.GetString(), install_list.get()); // Delete any old_chrome.exe if present. install_list->AddDeleteTreeWorkItem( @@ -225,7 +225,6 @@ bool installer::InstallNewVersion(const std::wstring& exe_path, // Create Version key (if not already present) and set the new Chrome // version as last step. - BrowserDistribution* dist = BrowserDistribution::GetDistribution(); std::wstring version_key = dist->GetVersionKey(); install_list->AddCreateRegKeyWorkItem(reg_root, version_key); install_list->AddSetRegValueWorkItem(reg_root, version_key, -- cgit v1.1