diff options
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/install.cc | 18 | ||||
| -rw-r--r-- | chrome/installer/util/work_item_list.h | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index b051f82..7543212 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -160,13 +160,13 @@ bool installer::InstallNewVersion(const std::wstring& exe_path, std::wstring new_chrome_exe = AppendPath(install_path, installer_util::kChromeNewExe); BrowserDistribution* dist = BrowserDistribution::GetDistribution(); - RegKey chrome_key(reg_root, dist->GetVersionKey().c_str(), - KEY_READ | KEY_WRITE); + RegKey chrome_key(reg_root, dist->GetVersionKey().c_str(), KEY_READ); std::wstring current_version; if (file_util::PathExists(new_chrome_exe)) chrome_key.ReadValue(google_update::kRegOldVersionField, ¤t_version); if (current_version.empty()) chrome_key.ReadValue(google_update::kRegVersionField, ¤t_version); + chrome_key.Close(); install_list->AddDeleteTreeWorkItem(new_chrome_exe, std::wstring()); install_list->AddCopyTreeWorkItem( @@ -250,11 +250,17 @@ bool installer::InstallNewVersion(const std::wstring& exe_path, } } } else { - if (chrome_key.ValueExists(google_update::kRegOldVersionField) && - !chrome_key.DeleteValue(google_update::kRegOldVersionField)) { - LOG(ERROR) << "New chrome.exe doesn't exist but failed to delete " - << "old version value in registry."; + scoped_ptr<WorkItemList> inuse_list(WorkItem::CreateWorkItemList()); + inuse_list->AddDeleteRegValueWorkItem(reg_root, version_key, + google_update::kRegOldVersionField, + true); + inuse_list->AddDeleteRegValueWorkItem(reg_root, version_key, + google_update::kRegRenameCmdField, + true); + if (!inuse_list->Do()) { + LOG(ERROR) << "Couldn't write old version/rename value to registry."; success = false; + inuse_list->Rollback(); } } } diff --git a/chrome/installer/util/work_item_list.h b/chrome/installer/util/work_item_list.h index 227533c..18cb186 100644 --- a/chrome/installer/util/work_item_list.h +++ b/chrome/installer/util/work_item_list.h @@ -47,7 +47,7 @@ class WorkItemList : public WorkItem { // Add a DeleteRegValueWorkItem that deletes registry value of type REG_SZ // or REG_DWORD. bool AddDeleteRegValueWorkItem(HKEY predefined_root, std::wstring key_path, - std::wstring value_name, bool it_str_type); + std::wstring value_name, bool is_str_type); // Add a DeleteTreeWorkItem that recursively deletes a file system // hierarchy at the given root path. A key file can be optionally specified |