Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: chrome/browser/shell_integration_win.cc

Issue 10837222: Enable EULA dialog to be shown from metro Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dear Greg, the third. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/process_singleton_win.cc ('k') | chrome/common/chrome_result_codes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « chrome/browser/process_singleton_win.cc ('k') | chrome/common/chrome_result_codes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698