Avoid Google Chrome/Chromium default browser conflict by renaming Capabilities key.

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 75 matching lines @@
         prog_id + L"\\shell\\open\\command", install_cmd));
 
     // .crx file type extension
     std::wstring file_extension_key(L"Software\\Classes\\");
     file_extension_key.append(L".");
     file_extension_key.append(chrome::kExtensionFileExtension);
     entries.push_front(new RegistryEntry(file_extension_key,
                                          ShellUtil::kChromeExtProgId));
 
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+    std::wstring start_menu_entry(ShellUtil::kRegStartMenuInternet);
+    start_menu_entry.append(L"\\" + dist->GetApplicationName());
+    entries.push_front(new RegistryEntry(start_menu_entry,
+                                         dist->GetApplicationName()));
     entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe",
-        dist->GetApplicationName()));
+        start_menu_entry + ShellUtil::kRegShellOpen, quoted_exe_path));
     entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\shell\\open\\"
-            L"command",
-        quoted_exe_path));
+        start_menu_entry + ShellUtil::kRegDefaultIcon, icon_path));
+
+    std::wstring install_info(start_menu_entry + L"\\InstallInfo");
+    entries.push_front(new RegistryEntry(install_info, L"ReinstallCommand",
+        quoted_exe_path + L" --" + switches::kMakeDefaultBrowser));
+    entries.push_front(new RegistryEntry(install_info, L"HideIconsCommand",
+        quoted_exe_path + L" --" + switches::kHideIcons));
+    entries.push_front(new RegistryEntry(install_info, L"ShowIconsCommand",
+        quoted_exe_path + L" --" + switches::kShowIcons));
+    entries.push_front(new RegistryEntry(install_info, L"IconsVisible", 1));
+
+    std::wstring capabilities(start_menu_entry + L"\\Capabilities");
+    entries.push_front(new RegistryEntry(ShellUtil::kRegRegisteredApplications,
+                                         dist->GetApplicationName(),
+                                         capabilities));
     entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\DefaultIcon",
-        icon_path));
+        capabilities, L"ApplicationDescription", dist->GetApplicationName()));
     entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\InstallInfo",
-        L"ReinstallCommand",
-        quoted_exe_path + L" --" + switches::kMakeDefaultBrowser));
+        capabilities, L"ApplicationIcon", icon_path));
     entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\InstallInfo",
-        L"HideIconsCommand",
-        quoted_exe_path + L" --" + switches::kHideIcons));
-    entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\InstallInfo",
-        L"ShowIconsCommand",
-        quoted_exe_path + L" --" + switches::kShowIcons));
-    entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\InstallInfo",
-        L"IconsVisible", 1));
+        capabilities, L"ApplicationName", dist->GetApplicationName()));
 
-    entries.push_front(new RegistryEntry(
-        ShellUtil::kRegRegisteredApplications,
-        dist->GetApplicationName(),
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities"));
-    entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities",
-        L"ApplicationDescription", dist->GetApplicationName()));
-    entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities",
-        L"ApplicationIcon", icon_path));
-    entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities",
-        L"ApplicationName", dist->GetApplicationName()));
-
-    entries.push_front(new RegistryEntry(
-        L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\"
-            L"StartMenu",
-        L"StartMenuInternet", L"chrome.exe"));
+    entries.push_front(new RegistryEntry(capabilities + L"\\StartMenu",
+        L"StartMenuInternet", dist->GetApplicationName()));
     for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) {
       entries.push_front(new RegistryEntry(
-          L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\"
-              L"FileAssociations",
+          capabilities + L"\\FileAssociations",
           ShellUtil::kFileAssociations[i], ShellUtil::kChromeHTMLProgId));
     }
     for (int i = 0; ShellUtil::kProtocolAssociations[i] != NULL; i++) {
       entries.push_front(new RegistryEntry(
-          L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\"
-              L"URLAssociations",
+          capabilities + L"\\URLAssociations",
           ShellUtil::kProtocolAssociations[i], ShellUtil::kChromeHTMLProgId));
     }
     return entries;
   }
 
   // Generate work_item tasks required to create current regitry entry and
   // add them to the given work item list.
   void AddToWorkItemList(HKEY root, WorkItemList *items) {
     items->AddCreateRegKeyWorkItem(root, _key_path);
     if (_is_string) {
@@ skipping 99 matching lines @@
     std::wstring dde_path = key_path + L"\\shell\\open\\ddeexec";
     items->AddCreateRegKeyWorkItem(root_key, dde_path);
     items->AddSetRegValueWorkItem(root_key, dde_path, L"", L"", true);
     // <root hkey>\Software\Classes\<protocol>\shell\@
     std::wstring protocol_shell_path = key_path + ShellUtil::kRegShellPath;
     items->AddSetRegValueWorkItem(root_key, protocol_shell_path, L"",
                                   L"open", true);
   }
 
   // start->Internet shortcut.
-  std::wstring exe_name = file_util::GetFilenameFromPath(chrome_exe);
   std::wstring start_internet(ShellUtil::kRegStartMenuInternet);
   items->AddCreateRegKeyWorkItem(root_key, start_internet);
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   items->AddSetRegValueWorkItem(root_key, start_internet, L"",
-                                exe_name, true);
+                                dist->GetApplicationName(), true);
 
   // Apply all the registry changes and if there is a problem, rollback
   if (!items->Do()) {
     LOG(ERROR) << "Error while registering Chrome as default browser";
     items->Rollback();
     return false;
   }
   return true;
 }
 
@@ skipping 396 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
   }
 }