diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 19:01:13 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 19:01:13 +0000 |
| commit | 452fc5418259b01cdd2d92c00e03780ef04b4be4 (patch) | |
| tree | 597bc2da45d6cedcb366a2aea55ab3ce68eb8e3d /chrome/installer/setup/setup.cc | |
| parent | 2ceafa3ddbaaa90ff73abf9941eae217c7808710 (diff) | |
| download | chromium_src-452fc5418259b01cdd2d92c00e03780ef04b4be4.zip chromium_src-452fc5418259b01cdd2d92c00e03780ef04b4be4.tar.gz chromium_src-452fc5418259b01cdd2d92c00e03780ef04b4be4.tar.bz2 | |
Now omaha supports displaying custom error string through registry keys.
Add error strings in Chrome installer.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/setup.cc')
| -rw-r--r-- | chrome/installer/setup/setup.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/installer/setup/setup.cc b/chrome/installer/setup/setup.cc index 0f5b629..8a301da 100644 --- a/chrome/installer/setup/setup.cc +++ b/chrome/installer/setup/setup.cc @@ -14,9 +14,8 @@ #include "chrome/installer/setup/setup_constants.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/create_reg_key_work_item.h" -#include "chrome/installer/util/l10n_string_util.h" -#include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/helper.h" +#include "chrome/installer/util/install_util.h" #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/version.h" @@ -171,6 +170,9 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome( std::wstring install_path(GetChromeInstallPath(system_install)); if (install_path.empty()) { LOG(ERROR) << "Could not get installation destination path."; + InstallUtil::SetInstallerError(system_install, + installer_util::INSTALL_FAILED, + IDS_INSTALL_FAILED_BASE); return installer_util::INSTALL_FAILED; } else { LOG(INFO) << "install destination path: " << install_path; @@ -187,6 +189,9 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome( installer_util::InstallStatus result; if (!install_success) { LOG(ERROR) << "Install failed."; + InstallUtil::SetInstallerError(system_install, + installer_util::INSTALL_FAILED, + IDS_INSTALL_FAILED_BASE); result = installer_util::INSTALL_FAILED; } else { if (!installed_version) { |