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..9d45588b6452be7e42b168de078bb02f0fc081c4 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)) {
@@ -207,12 +208,11 @@ string16 ReadArgumentsFromPinnedTaskbarShortcut() {
     shortcut = shortcut.Append(
         L"Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar");
 
-    // TODO(robertshield): Get this stuff from BrowserDistribution.
-#if defined(GOOGLE_CHROME_BUILD)
-    shortcut = shortcut.Append(L"Google Chrome.lnk");
-#else
-    shortcut = shortcut.Append(L"Chromium.lnk");
-#endif
+    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+    base::string16 link_name = dist->GetShortcutName(
+        BrowserDistribution::SHORTCUT_CHROME);
+    link_name.append(installer::kLnkExt);

[gab, 2013/09/06 18:40:08]

I think it's fine to do this inline above (i.e. GetShortcutName() +
installer::kLnkExt).

[zturner, 2013/09/06 20:53:16]

Done.

+    shortcut = shortcut.Append(link_name);
 
     string16 arguments;
     if (GetArgumentsFromShortcut(shortcut, &arguments)) {