Give SxS distribution its own registration GUIDs.

chrome/installer/util/shell_util.h

 // 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 declares methods that are useful for integrating Chrome in
 // Windows shell. These methods are all static and currently part of
 // ShellUtil class.
 
 #ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
@@ skipping 210 matching lines @@
 
   // Relative path of RegisteredApplications registry entry under which
   // we add Chrome as a Windows application
   static const wchar_t* kRegRegisteredApplications;
 
   // The key path and key name required to register Chrome on Windows such
   // that it can be launched from Start->Run just by name (chrome.exe).
   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;
 
   // File extensions that Chrome registers itself as the default handler
   // for when the user makes Chrome the default browser.
   static const wchar_t* kDefaultFileAssociations[];
 
   // File extensions that Chrome registers itself as being capable of
   // handling.
@@ skipping 49 matching lines @@
   // Registry value name for the OpenWithProgids entry for file associations.
   static const wchar_t* kRegOpenWithProgids;
 
   // Returns true if |chrome_exe| is registered in HKLM with |suffix|.
   // Note: This only checks one deterministic key in HKLM for |chrome_exe| and
   // doesn't otherwise validate a full Chrome install in HKLM.
   static bool QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist,
                                             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);
 
   // Sets |path| to the path for a shortcut at the |location| desired for the
   // given |level| (CURRENT_USER for per-user path and SYSTEM_LEVEL for
   // all-users path).
   // Returns false on failure.
   static bool GetShortcutPath(ShellUtil::ShortcutLocation location,
                               BrowserDistribution* dist,
@@ skipping 250 matching lines @@
   // required by the base32 standard for inputs that aren't a multiple of 5
   // bytes.
   static string16 ByteArrayToBase32(const uint8* bytes, size_t size);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_SHELL_UTIL_H_