| Index: chrome/installer/util/install_util.cc
|
| ===================================================================
|
| --- chrome/installer/util/install_util.cc (revision 114230)
|
| +++ chrome/installer/util/install_util.cc (working copy)
|
| @@ -39,6 +39,7 @@
|
|
|
| const wchar_t kStageBinaryPatching[] = L"binary_patching";
|
| const wchar_t kStageBuilding[] = L"building";
|
| +const wchar_t kStageConfiguringAutoLaunch[] = L"configuring_auto_launch";
|
| const wchar_t kStageCopyingPreferencesFile[] = L"copying_prefs";
|
| const wchar_t kStageCreatingShortcuts[] = L"creating_shortcuts";
|
| const wchar_t kStageEnsemblePatching[] = L"ensemble_patching";
|
| @@ -69,7 +70,8 @@
|
| kStageCreatingShortcuts,
|
| kStageRegisteringChrome,
|
| kStageRemovingOldVersions,
|
| - kStageFinishing
|
| + kStageFinishing,
|
| + kStageConfiguringAutoLaunch,
|
| };
|
|
|
| COMPILE_ASSERT(installer::NUM_STAGES == arraysize(kStages),
|
| @@ -173,7 +175,8 @@
|
| DCHECK(dist);
|
| RegKey key;
|
| HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
|
| - LONG result = key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_READ);
|
| + LONG result = key.Open(reg_root, dist->GetVersionKey().c_str(),
|
| + KEY_QUERY_VALUE);
|
|
|
| std::wstring version_str;
|
| if (result == ERROR_SUCCESS)
|
|
|