Give SxS distribution its own registration GUIDs.

chrome/installer/util/shell_util.h

Index: chrome/installer/util/shell_util.h
diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
index 7d42c3c8394a571efdcb4da0e42ad45948f585e3..9579f63d527ab6daf6a1c6617572d135ec5f8ba9 100644
--- a/chrome/installer/util/shell_util.h
+++ b/chrome/installer/util/shell_util.h
@@ -228,11 +228,25 @@ class ShellUtil {
   static const wchar_t* kAppPathsRegistryKey;
   static const wchar_t* kAppPathsRegistryPathName;
 
+#if defined(GOOGLE_CHROME_BUILD)
   // Name that we give to Chrome file association handler ProgId.
-  static const wchar_t* kChromeHTMLProgId;
+  static const wchar_t* kChromeStableHTMLProgId;

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

remove these constants from the header since they shouldn't be used directly.

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

Done.

 
   // Description of Chrome file association handler ProgId.
-  static const wchar_t* kChromeHTMLProgIdDesc;
+  static const wchar_t* kChromeStableHTMLProgIdDesc;
+
+  // Name that we give to Chrome Canary file association handler ProgId.
+  static const wchar_t* kChromeSXSHTMLProgId;
+
+  // Description of Chrome Canary file association handler ProgId.
+  static const wchar_t* kChromeSXSHTMLProgIdDesc;
+#else
+  // Name that we give to Chromium file association handler ProgId.
+  static const wchar_t* kChromiumHTMLProgId;
+
+  // Description of Chromium file association handler ProgId.
+  static const wchar_t* kChromiumHTMLProgIdDesc;
+#endif
 
   // Registry path that stores url associations on Vista.
   static const wchar_t* kRegVistaUrlPrefs;
@@ -302,6 +316,14 @@ class ShellUtil {
                                             const string16& chrome_exe,
                                             const string16& suffix);
 
+  // Returns the Browser ProgId prefix (e.g. ChromeHTML, ChromiumHTM, etc...).
+  // The full id is of the form |prefix||suffix| where suffix is a 26-digit
+  // alpha-numeric identifier.
+  static string16 GetBrowserProgIdPrefix();

[gab, 2013/09/03 21:05:19]

This should be in BrowserDistribution and have subclassing and runtime
assignment through GetDistribution() do the logic split between
Chrome/Canary/Chromium.

See GetBaseAppId() in BrowserDistribution for an example.

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

Done.

+
+  // Returns the Browser ProgId description.
+  static string16 GetBrowserProgIdDesc();

[gab, 2013/09/03 21:05:19]

Same for this.

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

Done.

+
   // Returns true if the current Windows version supports the presence of
   // shortcuts at |location|.
   static bool ShortcutLocationIsSupported(ShellUtil::ShortcutLocation location);