Give SxS distribution its own registration GUIDs.

win8/metro_driver/winrt_utils.cc

Index: win8/metro_driver/winrt_utils.cc
diff --git a/win8/metro_driver/winrt_utils.cc b/win8/metro_driver/winrt_utils.cc
index be348dc61146fc9515c30067b8f9ad52e8f31911..56569f65939dd9b714001646967fc515576696f1 100644
--- a/win8/metro_driver/winrt_utils.cc
+++ b/win8/metro_driver/winrt_utils.cc
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
+#include "chrome/installer/util/install_util.h"
 
 void CheckHR(HRESULT hr, const char* message) {
   if (FAILED(hr)) {
@@ -209,7 +210,10 @@ string16 ReadArgumentsFromPinnedTaskbarShortcut() {
 
     // TODO(robertshield): Get this stuff from BrowserDistribution.
 #if defined(GOOGLE_CHROME_BUILD)
-    shortcut = shortcut.Append(L"Google Chrome.lnk");
+    if (InstallUtil::IsChromeSxSProcess())

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

Use BrowserDistribution::GetShortcutName() instead of hardcoding the name here
(you'll have to append installer::kLnkExt to that name).

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

Done.

+      shortcut = shortcut.Append(L"Google Chrome Canary.lnk");
+    else
+      shortcut = shortcut.Append(L"Google Chrome.lnk");
 #else
     shortcut = shortcut.Append(L"Chromium.lnk");
 #endif