Give SxS distribution its own registration GUIDs.

chrome/installer/util/shell_util.cc

 // Copyright (c) 2012 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 "chrome/installer/util/shell_util.h"
@@ skipping 84 matching lines @@
   DWORD type_mask = VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER |
       VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR;
 
   return VerifyVersionInfo(&min_version_info, type_mask, condition_mask) != 0;
 }
 
 // Returns the current (or installed) browser's ProgId (e.g.
 // "ChromeHTML|suffix|").
 // |suffix| can be the empty string.
 string16 GetBrowserProgId(const string16& suffix) {
-  string16 chrome_html(ShellUtil::kChromeHTMLProgId);
+  string16 chrome_html(ShellUtil::GetBrowserProgIdPrefix());
   chrome_html.append(suffix);
 
   // ProgIds cannot be longer than 39 characters.
   // Ref: http://msdn.microsoft.com/en-us/library/aa911706.aspx.
   // Make all new registrations comply with this requirement (existing
   // registrations must be preserved).
   string16 new_style_suffix;
   if (ShellUtil::GetUserSpecificRegistrySuffix(&new_style_suffix) &&
       suffix == new_style_suffix && chrome_html.length() > 39) {
     NOTREACHED();
@@ skipping 166 matching lines @@
         entries->push_back(new RegistryEntry(
             sub_path, ShellUtil::kRegDelegateExecute, delegate_guid));
       }
     }
 
     // File association ProgId
     string16 chrome_html_prog_id(ShellUtil::kRegClasses);
     chrome_html_prog_id.push_back(base::FilePath::kSeparators[0]);
     chrome_html_prog_id.append(GetBrowserProgId(suffix));
     entries->push_back(new RegistryEntry(
-        chrome_html_prog_id, ShellUtil::kChromeHTMLProgIdDesc));
+        chrome_html_prog_id, ShellUtil::GetBrowserProgIdDesc()));
     entries->push_back(new RegistryEntry(
         chrome_html_prog_id, ShellUtil::kRegUrlProtocol, L""));
     entries->push_back(new RegistryEntry(
         chrome_html_prog_id + ShellUtil::kRegDefaultIcon, icon_path));
     entries->push_back(new RegistryEntry(
         chrome_html_prog_id + ShellUtil::kRegShellOpen, open_cmd));
     if (set_delegate_execute) {
       entries->push_back(new RegistryEntry(
           chrome_html_prog_id + ShellUtil::kRegShellOpen,
           ShellUtil::kRegDelegateExecute, delegate_guid));
@@ skipping 479 matching lines @@
                              const string16& chrome_exe,
                              const string16& suffix,
                              RegistrationConfirmationLevel confirmation_level) {
   // Get the appropriate key to look for based on the level desired.
   string16 reg_key;
   switch (confirmation_level) {
     case CONFIRM_PROGID_REGISTRATION:
       // Software\Classes\ChromeHTML|suffix|
       reg_key = ShellUtil::kRegClasses;
       reg_key.push_back(base::FilePath::kSeparators[0]);
-      reg_key.append(ShellUtil::kChromeHTMLProgId);
+      reg_key.append(ShellUtil::GetBrowserProgIdPrefix());
       reg_key.append(suffix);
       break;
     case CONFIRM_SHELL_REGISTRATION:
     case CONFIRM_SHELL_REGISTRATION_IN_HKLM:
       // Software\Clients\StartMenuInternet\Google Chrome|suffix|
       reg_key = RegistryEntry::GetBrowserClientKey(dist, suffix);
       break;
     default:
       NOTREACHED();
       break;
@@ skipping 248 matching lines @@
       CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC);
   if (FAILED(hr))
     return ShellUtil::UNKNOWN_DEFAULT;
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return ShellUtil::UNKNOWN_DEFAULT;
   }
-  string16 prog_id(ShellUtil::kChromeHTMLProgId);
+  string16 prog_id(ShellUtil::GetBrowserProgIdPrefix());
   prog_id += ShellUtil::GetCurrentInstallationSuffix(dist, chrome_exe.value());
 
   for (size_t i = 0; i < num_protocols; ++i) {
     base::win::ScopedCoMem<wchar_t> current_app;
     hr = registration->QueryCurrentDefault(protocols[i], AT_URLPROTOCOL,
                                            AL_EFFECTIVE, &current_app);
     if (FAILED(hr) || prog_id.compare(current_app) != 0)
       return ShellUtil::NOT_DEFAULT;
   }
 
@@ skipping 265 matching lines @@
 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 Document";
+const wchar_t* ShellUtil::kChromeStableHTMLProgId = L"ChromeHTML";

[grt (UTC plus 2), 2013/09/04 03:33:36]

these constants are no longer public, so move them up into the unnamed
namespace. looks like there's a private constant on line 74, so that's a good
place for them.

[zturner, 2013/09/05 01:35:29]

Done.

+const wchar_t* ShellUtil::kChromeStableHTMLProgIdDesc = L"Chrome HTML Document";
+const wchar_t* ShellUtil::kChromeSXSHTMLProgId = L"ChromeSSHTM";
+const wchar_t* ShellUtil::kChromeSXSHTMLProgIdDesc =
+    L"Chrome Canary HTML Document";
 #else
 // This used to be "ChromiumHTML", but was forced to become "ChromiumHTM"
 // because of http://crbug.com/153349 as with the '.' and 26 characters suffix
 // added on user-level installs, the generated progid for Chromium was 39
 // characters long which, according to MSDN (
 // http://msdn.microsoft.com/library/aa911706.aspx), is the maximum length
 // for a progid. It was however determined through experimentation that the 39
 // character limit mentioned on MSDN includes the NULL character...
-const wchar_t* ShellUtil::kChromeHTMLProgId = L"ChromiumHTM";
-const wchar_t* ShellUtil::kChromeHTMLProgIdDesc = L"Chromium HTML Document";
+const wchar_t* ShellUtil::kChromiumHTMLProgId = L"ChromiumHTM";
+const wchar_t* ShellUtil::kChromiumHTMLProgIdDesc = L"Chromium HTML Document";
 #endif
 
 const wchar_t* ShellUtil::kDefaultFileAssociations[] = {L".htm", L".html",
     L".shtml", L".xht", L".xhtml", NULL};
 const wchar_t* ShellUtil::kPotentialFileAssociations[] = {L".htm", L".html",
     L".shtml", L".xht", L".xhtml", L".webp", NULL};
 const wchar_t* ShellUtil::kBrowserProtocolAssociations[] = {L"ftp", L"http",
     L"https", NULL};
 const wchar_t* ShellUtil::kPotentialProtocolAssociations[] = {L"ftp", L"http",
     L"https", L"irc", L"mailto", L"mms", L"news", L"nntp", L"sms", L"smsto",
@@ skipping 14 matching lines @@
 const wchar_t* ShellUtil::kRegDelegateExecute = L"DelegateExecute";
 const wchar_t* ShellUtil::kRegOpenWithProgids = L"OpenWithProgids";
 
 bool ShellUtil::QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist,
                                               const string16& chrome_exe,
                                               const string16& suffix) {
   return QuickIsChromeRegistered(dist, chrome_exe, suffix,
                                  CONFIRM_SHELL_REGISTRATION_IN_HKLM);
 }
 
+
+string16 ShellUtil::GetBrowserProgIdPrefix() {
+#if defined(GOOGLE_CHROME_BUILD)
+  if (InstallUtil::IsChromeSXSProcess())
+    return string16(ShellUtil::kChromeSXSHTMLProgId);
+  else
+    return string16(ShellUtil::kChromeStableHTMLProgId);
+#else
+  return string16(ShellUtil::kChromiumHTMLProgId);
+#endif
+}
+
+string16 ShellUtil::GetBrowserProgIdDesc() {
+#if defined(GOOGLE_CHROME_BUILD)
+  if (InstallUtil::IsChromeSXSProcess())
+    return string16(ShellUtil::kChromeSXSHTMLProgIdDesc);
+  else
+    return string16(ShellUtil::kChromeStableHTMLProgIdDesc);
+#else
+  return string16(ShellUtil::kChromiumHTMLProgIdDesc);
+#endif
+}
+
 bool ShellUtil::ShortcutLocationIsSupported(
     ShellUtil::ShortcutLocation location) {
   switch (location) {
     case SHORTCUT_LOCATION_DESKTOP:
       return true;
     case SHORTCUT_LOCATION_QUICK_LAUNCH:
       return true;
     case SHORTCUT_LOCATION_START_MENU:
       return true;
     case SHORTCUT_LOCATION_TASKBAR_PINS:
@@ skipping 732 matching lines @@
     // are any left...).
     if (free_bits >= 8 && next_byte_index < size) {
       free_bits -= 8;
       bit_stream += bytes[next_byte_index++] << free_bits;
     }
   }
 
   DCHECK_EQ(ret.length(), encoded_length);
   return ret;
 }