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

Unified Diff: win8/delegate_execute/command_execute_impl.cc

Issue 23258005: Give SxS distribution its own registration GUIDs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move typedef Created 7 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
Index: win8/delegate_execute/command_execute_impl.cc
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc
index bfb1e517baacbc01524e3b903e02b74cbc5347dd..463bbb7015ee1f1d1ea7de6f9d9b52d1572def40 100644
--- a/win8/delegate_execute/command_execute_impl.cc
+++ b/win8/delegate_execute/command_execute_impl.cc
@@ -23,6 +23,9 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/shell_util.h"
#include "chrome/installer/util/util_constants.h"
#include "ui/base/clipboard/clipboard_util_win.h"
#include "win8/delegate_execute/chrome_util.h"
@@ -322,7 +325,11 @@ STDMETHODIMP CommandExecuteImpl::Execute() {
return S_OK;
}
- string16 app_id = delegate_execute::GetAppId(chrome_exe_);
+ BrowserDistribution* distribution = BrowserDistribution::GetDistribution();
+ bool is_per_user_install = InstallUtil::IsPerUserInstall(
+ chrome_exe_.value().c_str());
+ string16 app_id = ShellUtil::GetBrowserModelId(
+ distribution, is_per_user_install);
DWORD pid = 0;
if (launch_scheme_ == INTERNET_SCHEME_FILE &&

Powered by Google App Engine
This is Rietveld 408576698