diff options
| -rw-r--r-- | chrome/app/chromium_strings.grd | 8 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 6 | ||||
| -rw-r--r-- | chrome/chrome_installer.gypi | 2 | ||||
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 14 | ||||
| -rwxr-xr-x | chrome/installer/util/prebuild/create_string_rc.py | 2 |
5 files changed, 28 insertions, 4 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 5e62faa..d25125f 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -342,6 +342,9 @@ be available for now. --> <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when higher version already exists."> This computer already has a more recent version of Chromium. If the software is not working, please uninstall Chromium and download it again. </message> + <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when higher version already exists."> + This computer already has a more recent version of Chromium Frame. If the software is not working, please uninstall Chromium Frame and download it again. + </message> <message name="IDS_INSTALL_USER_LEVEL_EXISTS" desc="Error displayed during system level install if user level Chromium is already installed."> Chromium has already been installed for this user. If the software is not working, please uninstall Chromium and download it again. </message> @@ -352,7 +355,10 @@ be available for now. --> Installation failed due to unspecified error. If Chromium is currently running, please close it and try again. </message> <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if installation fails due to Chrome running."> - Can not install the same Google Chrome version that is currently running. Please close Google Chrome and try again. + Can not install the same Chromium version that is currently running. Please close Chromium and try again. + </message> + <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome running."> + Can not install the same Chromium Frame version that is currently running. Please close Chromium Frame and try again. </message> <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself."> Installation failed due to unspecified error. Please download Chromium again. diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 84a934b..20ac348 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -393,6 +393,9 @@ Chrome supports. --> <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when higher version already exists."> This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and download it again. </message> + <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when higher version of Chrome Frame already exists"> + This computer already has a more recent version of Google Chrome Frame. If the software is not working, please uninstall Google Chrome Frame and download it again. + </message> <message name="IDS_INSTALL_USER_LEVEL_EXISTS" desc="Error displayed during system level install if user level Chromium is already installed."> Google Chrome has already been installed for this user. If the software is not working, please uninstall Google Chrome and download it again. </message> @@ -405,6 +408,9 @@ Chrome supports. --> <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if installation fails due to Chrome running."> Can not install the same Google Chrome version that is currently running. Please close Google Chrome and try again. </message> + <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome Frame already running."> + Can not install the same Google Chrome Frame version that is currently running. Please close Google Chrome Frame and try again. + </message> <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself."> Installation failed due to unspecified error. Please download Google Chrome again. </message> diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index e4b515c..cb3b244 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -130,7 +130,7 @@ }, ], 'sources': [ - 'installer/app/chromium_strings.grd', + 'app/chromium_strings.grd', ], 'direct_dependent_settings': { 'include_dirs': [ 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()) { diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py index 7b40f75..c7eb9c1 100755 --- a/chrome/installer/util/prebuild/create_string_rc.py +++ b/chrome/installer/util/prebuild/create_string_rc.py @@ -49,10 +49,12 @@ kStringIds = [ 'IDS_UNINSTALL_CHROME', 'IDS_ABOUT_VERSION_COMPANY_NAME', 'IDS_INSTALL_HIGHER_VERSION', + 'IDS_INSTALL_HIGHER_VERSION_CF', 'IDS_INSTALL_USER_LEVEL_EXISTS', 'IDS_INSTALL_SYSTEM_LEVEL_EXISTS', 'IDS_INSTALL_FAILED', 'IDS_SAME_VERSION_REPAIR_FAILED', + 'IDS_SAME_VERSION_REPAIR_FAILED_CF', 'IDS_SETUP_PATCH_FAILED', 'IDS_INSTALL_OS_NOT_SUPPORTED', 'IDS_INSTALL_OS_ERROR', |