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

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include <windows.h>
@@ skipping 35 matching lines @@
   // This method returns a list of all the registry entries that are needed
   // to register Chrome.
   static std::list<RegistryEntry*> GetAllEntries(
       const std::wstring& chrome_exe) {
     std::list<RegistryEntry*> entries;
     std::wstring icon_path(chrome_exe);
     ShellUtil::GetChromeIcon(icon_path);
     std::wstring quoted_exe_path = L"\"" + chrome_exe + L"\"";
     std::wstring open_cmd = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
 
-    entries.push_front(new RegistryEntry(L"Software\\Classes\\ChromeHTML",
+    std::wstring chrome_html_prog_id(ShellUtil::kRegClasses);
+    file_util::AppendToPath(&chrome_html_prog_id, ShellUtil::kChromeHTMLProgId);
+    entries.push_front(new RegistryEntry(chrome_html_prog_id,
                                          ShellUtil::kChromeHTMLProgIdDesc));
     entries.push_front(new RegistryEntry(
-        L"Software\\Classes\\ChromeHTML\\DefaultIcon", icon_path));
+        chrome_html_prog_id + ShellUtil::kRegDefaultIcon, icon_path));
     entries.push_front(new RegistryEntry(
-        L"Software\\Classes\\ChromeHTML\\shell\\open\\command", open_cmd));
+        chrome_html_prog_id + ShellUtil::kRegShellOpen, open_cmd));
 
     std::wstring exe_name = file_util::GetFilenameFromPath(chrome_exe);
     std::wstring app_key = L"Software\\Classes\\Applications\\" + exe_name +
                            L"\\shell\\open\\command";
     entries.push_front(new RegistryEntry(app_key, open_cmd));
     for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) {
       std::wstring open_with_key(L"Software\\Classes\\");
       open_with_key.append(ShellUtil::kFileAssociations[i]);
       open_with_key.append(L"\\OpenWithList\\" + exe_name);
       entries.push_front(new RegistryEntry(open_with_key, std::wstring()));
@@ skipping 278 matching lines @@
       if (ret_val == ShellUtil::SUCCESS)
         return ShellUtil::SUCCESS;
     }
   }
   return ShellUtil::FAILURE;
 }
 
 // Remove unnecessary "URL Protocol" entry from shell registration.  This value
 // was written by older installers so ignoring error conditions.
 void RemoveUrlProtocol(HKEY root) {
-  RegKey key(root, L"Software\\Classes\\ChromeHTML", KEY_ALL_ACCESS);
+  std::wstring chrome_html_prog_id(ShellUtil::kRegClasses);
+  file_util::AppendToPath(&chrome_html_prog_id, ShellUtil::kChromeHTMLProgId);
+  RegKey key(root, chrome_html_prog_id.c_str(), KEY_ALL_ACCESS);
   key.DeleteValue(ShellUtil::kRegUrlProtocol);
 }
 
 }  // namespace
 
 
 const wchar_t* ShellUtil::kRegDefaultIcon = L"\\DefaultIcon";
 const wchar_t* ShellUtil::kRegShellPath = L"\\shell";
 const wchar_t* ShellUtil::kRegShellOpen = L"\\shell\\open\\command";
 const wchar_t* ShellUtil::kRegStartMenuInternet =
     L"Software\\Clients\\StartMenuInternet";
 const wchar_t* ShellUtil::kRegClasses = L"Software\\Classes";
 const wchar_t* ShellUtil::kRegRegisteredApplications =
     L"Software\\RegisteredApplications";
 const wchar_t* ShellUtil::kRegVistaUrlPrefs =
     L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\"
     L"http\\UserChoice";
 const wchar_t* ShellUtil::kAppPathsRegistryKey =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths";
 const wchar_t* ShellUtil::kAppPathsRegistryPathName = L"Path";
 
+#if defined(GOOGLE_CHROME_BUILD)
 const wchar_t* ShellUtil::kChromeHTMLProgId = L"ChromeHTML";
 const wchar_t* ShellUtil::kChromeHTMLProgIdDesc = L"Chrome HTML";
+#else
+const wchar_t* ShellUtil::kChromeHTMLProgId = L"ChromiumHTML";
+const wchar_t* ShellUtil::kChromeHTMLProgIdDesc = L"Chromium HTML";
+#endif
+
 const wchar_t* ShellUtil::kFileAssociations[] = {L".htm", L".html", L".shtml",
     L".xht", L".xhtml", NULL};
 const wchar_t* ShellUtil::kProtocolAssociations[] = {L"ftp", L"http", L"https",
     NULL};
 const wchar_t* ShellUtil::kRegUrlProtocol = L"URL Protocol";
 
 const wchar_t* ShellUtil::kChromeExtProgId = L"ChromeExt";
 const wchar_t* ShellUtil::kChromeExtProgIdDesc = L"Chrome Extension Installer";
 
 ShellUtil::RegisterStatus ShellUtil::AddChromeToSetAccessDefaults(
@@ skipping 271 matching lines @@
   } else {
     return file_util::UpdateShortcutLink(chrome_exe.c_str(),      // target
                                          shortcut.c_str(),        // shortcut
                                          chrome_path.c_str(),     // working dir
                                          NULL,                    // arguments
                                          description.c_str(),     // description
                                          chrome_exe.c_str(),      // icon file
                                          0);                      // icon index
   }
 }