Give SxS distribution its own registration GUIDs.

win8/metro_driver/winrt_utils.cc

 // 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.
 
 #include "stdafx.h"
 #include "winrt_utils.h"
 
 #include <shlobj.h>
 
 #include "base/files/file_path.h"
 #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)) {
     if (message)
       PLOG(DFATAL) << message << ", hr = " << std::hex << hr;
     else
       PLOG(DFATAL) << "COM ERROR" << ", hr = " << std::hex << hr;
   }
 }
 
@@ skipping 176 matching lines @@
 
 string16 ReadArgumentsFromPinnedTaskbarShortcut() {
   wchar_t path_buffer[MAX_PATH] = {};
 
   if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL,
                                 SHGFP_TYPE_CURRENT, path_buffer))) {
     base::FilePath shortcut(path_buffer);
     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)) {
       return arguments;
     }
   }
 
   return L"";
 }
 
 }  // namespace winrt_utils