Give SxS distribution its own registration GUIDs.

chrome/installer/util/google_chrome_distribution.cc

Index: chrome/installer/util/google_chrome_distribution.cc
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 2ae5338f23f94f1dcc0c4bf8494e6a612f873f3d..aceff0bacab5353a705125866829df5a57429c97 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -35,8 +35,12 @@ namespace {
 
 const wchar_t kChromeGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 const wchar_t kBrowserAppId[] = L"Chrome";
-const wchar_t kCommandExecuteImplUuid[] =
+const wchar_t kBrowserProgIdPrefix[] = L"ChromeHTML";
+const wchar_t kBrowserProgIdDesc[] = L"Chrome HTML Document";
+const wchar_t kCommandExecuteImplUuidString[] =
     L"{5C65F4B0-3651-4514-B207-D10CB699B14B}";
+const GUID kCommandExecuteImplUuid = {0x5C65F4B0, 0x3651, 0x4514,
+    {0xB2, 0x07, 0xD1, 0x0C, 0xB6, 0x99, 0xB1, 0x4B}};
 
 // The Google Chrome App Launcher icon is index 5; see chrome_exe.rc.
 const int kAppLauncherIconIndex = 5;
@@ -156,6 +160,14 @@ string16 GoogleChromeDistribution::GetBaseAppId() {
   return kBrowserAppId;
 }
 
+string16 GoogleChromeDistribution::GetBrowserProgIdPrefix() {
+  return kBrowserProgIdPrefix;
+}
+
+string16 GoogleChromeDistribution::GetBrowserProgIdDesc() {
+  return kBrowserProgIdDesc;
+}
+
 string16 GoogleChromeDistribution::GetInstallSubDir() {
   string16 sub_dir(installer::kGoogleChromeInstallSubDir1);
   sub_dir.append(L"\\");
@@ -259,9 +271,16 @@ string16 GoogleChromeDistribution::GetIconFilename() {
   return installer::kChromeExe;
 }
 
-bool GoogleChromeDistribution::GetCommandExecuteImplClsid(
+bool GoogleChromeDistribution::GetCommandExecuteImplClsidString(
     string16* handler_class_uuid) {
   if (handler_class_uuid)
+    *handler_class_uuid = kCommandExecuteImplUuidString;
+  return true;
+}
+
+bool GoogleChromeDistribution::GetCommandExecuteImplClsid(
+    CLSID* handler_class_uuid) {
+  if (handler_class_uuid)
     *handler_class_uuid = kCommandExecuteImplUuid;
   return true;
 }