Use different names for Chrome/Chromium for Chrome HTML prog id. If we

chrome/installer/setup/main.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <windows.h>
 #include <msi.h>
 #include <shlobj.h>
 
 #include "base/at_exit.h"
@@ skipping 276 matching lines @@
   if (key.Open(HKEY_CLASSES_ROOT, reg_key.c_str(), KEY_READ) &&
       key.ReadValue(NULL, &value) && (old_val == value)) {
     std::wstring key_path = L"Software\\Classes\\" + reg_key;
     if (key.Open(HKEY_CURRENT_USER, key_path.c_str(), KEY_WRITE))
       key.WriteValue(NULL, new_val.c_str());
     if (key.Open(HKEY_LOCAL_MACHINE, key_path.c_str(), KEY_WRITE))
       key.WriteValue(NULL, new_val.c_str());
   }
 }
 
-// This method is only temporary to update Chrome open cmd for existing users
-// of Chrome. This can be deleted once we make one release including this patch
-// to every user.
-void UpdateChromeOpenCmd(bool system_install) {
-  std::wstring chrome_exe =  installer::GetChromeInstallPath(system_install);
-  file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe);
-  std::wstring old_open_cmd = L"\"" + chrome_exe + L"\" \"%1\"";
-  std::wstring new_open_cmd = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
-  std::wstring reg_key[] = { L"ChromeHTML\\shell\\open\\command",
-                             L"http\\shell\\open\\command",
-                             L"https\\shell\\open\\command" };
-  for (int i = 0; i < _countof(reg_key); i++)
-    ReplaceRegistryValue(reg_key[i], old_open_cmd, new_open_cmd);
-}
-
 bool CheckPreInstallConditions(const installer::Version* installed_version,
                                int options,
                                installer_util::InstallStatus& status) {
   bool system_install = (options & installer_util::SYSTEM_LEVEL) != 0;
 
   // Check to avoid simultaneous per-user and per-machine installs.
   scoped_ptr<installer::Version>
       chrome_version(InstallUtil::GetChromeVersion(!system_install));
   if (chrome_version.get()) {
     LOG(ERROR) << "Already installed version " << chrome_version->GetString()
@@ skipping 116 matching lines @@
         }
         InstallUtil::WriteInstallerResult(system_install, install_status,
                                           install_msg_base, &chrome_exe);
         if (install_status == installer_util::FIRST_INSTALL_SUCCESS) {
           LOG(INFO) << "First install successful.";
           CopyPreferenceFileForFirstRun(options, cmd_line);
           // We never want to launch Chrome in system level install mode.
           if (!(options & installer_util::DO_NOT_LAUNCH_CHROME) &&
               !(options & installer_util::SYSTEM_LEVEL))
             installer::LaunchChrome(system_install);
-        } else if (install_status == installer_util::NEW_VERSION_UPDATED) {
-          // This is temporary hack and will be deleted after one release.
-          UpdateChromeOpenCmd(system_install);
         }
       }
     }
   }
 
   // Delete temporary files. These include install temporary directory
   // and master profile file if present.
   scoped_ptr<WorkItemList> cleanup_list(WorkItem::CreateWorkItemList());
   LOG(INFO) << "Deleting temporary directory " << temp_path;
   cleanup_list->AddDeleteTreeWorkItem(temp_path, std::wstring());
@@ skipping 158 matching lines @@
   } else {
     install_status = InstallChrome(parsed_command_line,
                                    installed_version.get(),
                                    options);
   }
 
   CoUninitialize();
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   return dist->GetInstallReturnCode(install_status);
 }