| Index: chrome/browser/shell_integration_win.cc
|
| diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
|
| index 08b988589ea6495f6b697c69de3544ed9be5ba21..54b7e022c087481a4e35fb635d34189b6aff325c 100644
|
| --- a/chrome/browser/shell_integration_win.cc
|
| +++ b/chrome/browser/shell_integration_win.cc
|
| @@ -294,7 +294,8 @@ bool GetExpectedAppId(const FilePath& chrome_exe,
|
| command_line.GetSwitchValueASCII(switches::kAppId)));
|
| } else {
|
| BrowserDistribution* dist = BrowserDistribution::GetDistribution();
|
| - app_name = ShellUtil::GetBrowserModelId(dist, chrome_exe.value());
|
| + app_name = ShellUtil::GetBrowserModelId(
|
| + dist, InstallUtil::IsPerUserInstall(chrome_exe.value().c_str()));
|
| }
|
|
|
| expected_app_id->assign(
|
| @@ -539,7 +540,9 @@ string16 ShellIntegration::GetChromiumModelIdForProfile(
|
| return dist->GetBaseAppId();
|
| }
|
| return GetAppModelIdForProfile(
|
| - ShellUtil::GetBrowserModelId(dist, chrome_exe.value()), profile_path);
|
| + ShellUtil::GetBrowserModelId(
|
| + dist, InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())),
|
| + profile_path);
|
| }
|
|
|
| string16 ShellIntegration::GetChromiumIconPath() {
|
|
|