Win: Use different AppUserModelID for SxS installs.

BUG=44572
TEST=see bug

Review URL: http://codereview.chromium.org/2616002

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

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 8d3a67a..d7aa86e 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -227,11 +227,10 @@ bool MigrateChromiumShortcutsTask::GetExpectedAppId(
     app_name = web_app::GenerateApplicationNameFromURL(
         GURL(command_line.GetSwitchValueASCII(switches::kApp)));
   } else {
-    app_name = chrome::kBrowserAppID;
+    app_name = BrowserDistribution::GetDistribution()->GetBrowserAppId();
   }
 
-  expected_app_id->assign(ShellIntegration::GetAppId(app_name.c_str(),
-                                                     profile_path));
+  expected_app_id->assign(ShellIntegration::GetAppId(app_name, profile_path));
   return true;
 }
 
@@ -386,7 +385,7 @@ bool ShellIntegration::IsFirefoxDefaultBrowser() {
   return ff_default;
 }
 
-std::wstring ShellIntegration::GetAppId(const wchar_t* app_name,
+std::wstring ShellIntegration::GetAppId(const std::wstring& app_name,
                                         const FilePath& profile_path) {
   std::wstring app_id(app_name);
 
@@ -402,7 +401,8 @@ std::wstring ShellIntegration::GetAppId(const wchar_t* app_name,
 }
 
 std::wstring ShellIntegration::GetChromiumAppId(const FilePath& profile_path) {
-  return GetAppId(chrome::kBrowserAppID, profile_path);
+  return GetAppId(BrowserDistribution::GetDistribution()->GetBrowserAppId(),
+                  profile_path);
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {