diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 14:07:06 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 14:07:06 +0000 |
| commit | 423c88bfda69923766a61de7261f9bf267a82705 (patch) | |
| tree | 60b683d5e0752c18c2688da3929dbf6414ab033e /chrome/installer/setup | |
| parent | 98f397e9a7720f1476e37b0966c9ad70ea4deebc (diff) | |
| download | chromium_src-423c88bfda69923766a61de7261f9bf267a82705.zip chromium_src-423c88bfda69923766a61de7261f9bf267a82705.tar.gz chromium_src-423c88bfda69923766a61de7261f9bf267a82705.tar.bz2 | |
Update installer error strings to include Chrome Frame specific branding when running in Chrome Frame mode.
Also fix the installer_util_strings target that had a broken dependency on a file that has since been moved.
BUG=46013
TEST=Google Chrome Frame is correctly displayed when the installer is run in Chrome Frame mode.
Review URL: http://codereview.chromium.org/3968005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index e6929a5..93b387e 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -282,8 +282,14 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line, installed_version->IsHigherThan(installer_version.get())) { LOG(ERROR) << "Higher version is already installed."; install_status = installer_util::HIGHER_VERSION_EXISTS; - InstallUtil::WriteInstallerResult(system_level, install_status, - IDS_INSTALL_HIGHER_VERSION_BASE, + + int result_resource_id = IDS_INSTALL_HIGHER_VERSION_BASE; + if (InstallUtil::IsChromeFrameProcess()) { + result_resource_id = IDS_INSTALL_HIGHER_VERSION_CF_BASE; + } + InstallUtil::WriteInstallerResult(system_level, + install_status, + result_resource_id, NULL); } else { // We want to keep uncompressed archive (chrome.7z) that we get after @@ -299,7 +305,11 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line, int install_msg_base = IDS_INSTALL_FAILED_BASE; std::wstring chrome_exe; if (install_status == installer_util::SAME_VERSION_REPAIR_FAILED) { + if (InstallUtil::IsChromeFrameProcess()) { + install_msg_base = IDS_SAME_VERSION_REPAIR_FAILED_CF_BASE; + } else { install_msg_base = IDS_SAME_VERSION_REPAIR_FAILED_BASE; + } } else if (install_status != installer_util::INSTALL_FAILED) { chrome_exe = installer::GetChromeInstallPath(system_level); if (chrome_exe.empty()) { |