Give SxS distribution its own registration GUIDs.

See the linked bug for more information about this change.

BUG=273248

gab: chrome/installer/*
ananta, cpu: win8/

Review URL: https://chromiumcodereview.appspot.com/23258005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222987 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 14 deletions

diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index 483d7d9..c4797fb 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -53,6 +53,7 @@
           'dependencies': [
             '../../base/base.gyp:base',
             '../../chrome/common_constants.gyp:common_constants',
+            '../../chrome/chrome.gyp:installer_util',
             '../../crypto/crypto.gyp:crypto',
             '../../google_update/google_update.gyp:google_update',
             '../../ipc/ipc.gyp:ipc',
@@ -89,8 +90,6 @@
                 'chrome_app_view.h',
                 'chrome_url_launch_handler.cc',
                 'chrome_url_launch_handler.h',
-                '../delegate_execute/chrome_util.cc',
-                '../delegate_execute/chrome_util.h',
                 'devices_handler.cc',
                 'devices_handler.h',
                 'file_picker.cc',
@@ -128,6 +127,7 @@
           'type': 'executable',
           'dependencies': [
             '../../base/base.gyp:base',
+            '../../chrome/chrome.gyp:installer_util',
             '../../testing/gtest.gyp:gtest',
             'metro_driver',
           ],
diff --git a/win8/metro_driver/toast_notification_handler.cc b/win8/metro_driver/toast_notification_handler.cc
index fb85456..ab014d4 100644
--- a/win8/metro_driver/toast_notification_handler.cc
+++ b/win8/metro_driver/toast_notification_handler.cc
@@ -11,9 +11,10 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
-// TODO(ananta)
-// Refactor the chrome_util and shell_util code from chrome into a common lib
-#include "win8/delegate_execute/chrome_util.h"
+#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/shell_util.h"
+
 #include "win8/metro_driver/winrt_utils.h"
 
 typedef winfoundtn::ITypedEventHandler<
@@ -201,11 +202,13 @@ void ToastNotificationHandler::DisplayNotification(
     NOTREACHED() << "Failed to get chrome exe path";
     return;
   }
-  string16 appid = delegate_execute::GetAppId(chrome_path);
+
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  bool is_per_user_install = InstallUtil::IsPerUserInstall(
+      chrome_path.value().c_str());
+  string16 appid = ShellUtil::GetBrowserModelId(dist, is_per_user_install);
   DVLOG(1) << "Chrome Appid is " << appid.c_str();
 
-  // TODO(ananta)
-  // We should probably use BrowserDistribution here to get the product name.
   mswrw::HString app_user_model_id;
   app_user_model_id.Attach(MakeHString(appid));
 
diff --git a/win8/metro_driver/winrt_utils.cc b/win8/metro_driver/winrt_utils.cc
index be348dc..6d66cec 100644
--- a/win8/metro_driver/winrt_utils.cc
+++ b/win8/metro_driver/winrt_utils.cc
@@ -11,6 +11,8 @@
 #include "base/logging.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
+#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/install_util.h"
 
 void CheckHR(HRESULT hr, const char* message) {
   if (FAILED(hr)) {
@@ -207,12 +209,10 @@ 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) + installer::kLnkExt;
+    shortcut = shortcut.Append(link_name);
 
     string16 arguments;
     if (GetArgumentsFromShortcut(shortcut, &arguments)) {