diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 22:58:59 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 22:58:59 +0000 |
| commit | e149a1b91440ce72c4244005849d84be89227343 (patch) | |
| tree | 0d87f48f7a8cc2417039f2f501e476c4e057551a /chrome | |
| parent | c277dd9a41daefd40f5a33b2dae154d6c554618d (diff) | |
| download | chromium_src-e149a1b91440ce72c4244005849d84be89227343.zip chromium_src-e149a1b91440ce72c4244005849d84be89227343.tar.gz chromium_src-e149a1b91440ce72c4244005849d84be89227343.tar.bz2 | |
* Fix two bugs
- quoted path to chrome exe for Google update to launch
- create Chrome guid key if not present.
BUG=1443250
TBR=huanr
Review URL: http://codereview.chromium.org/10403
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rwxr-xr-x | chrome/installer/setup/main.cc | 1 | ||||
| -rw-r--r-- | chrome/installer/util/install_util.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc index 97b351a..c3e417f 100755 --- a/chrome/installer/setup/main.cc +++ b/chrome/installer/setup/main.cc @@ -374,6 +374,7 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line, installer::GetChromeInstallPath(system_install); if (!chrome_exe.empty()) { file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe); + chrome_exe = L"\"" + chrome_exe + L"\""; InstallUtil::WriteInstallerResult(system_install, install_status, 0, &chrome_exe); } diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc index 188b653..dbd3a26 100644 --- a/chrome/installer/util/install_util.cc +++ b/chrome/installer/util/install_util.cc @@ -95,6 +95,7 @@ void InstallUtil::WriteInstallerResult(bool system_install, std::wstring key = dist->GetVersionKey(); int installer_result = (dist->GetInstallReturnCode(status) == 0) ? 0 : 1; scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList()); + install_list->AddCreateRegKeyWorkItem(root, key); install_list->AddSetRegValueWorkItem(root, key, L"InstallerResult", installer_result, true); install_list->AddSetRegValueWorkItem(root, key, L"InstallerError", |