commit 9bfc86df6a3ae4709b5c5b906e7e1255f33741b2
author huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed May 19 00:06:23 2010
committer huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed May 19 00:06:23 2010
tree 5d844207448d0f733a34cd4c1e3172d494b7d8dd
parent 81bf98ca3a0aa32be3902a22b63f0a5b17a18ff6

Using different Version environment variable for SxS.

BUG=44474
TEST=mini_installer.exe --chrome-sxs. The first run
should start regardless what is set for CHROME_VERSION.
  

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

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

chrome/app/client_util.cc

diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index c822ec8..e4b2b78 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -160,7 +160,9 @@
   if (dll)
     return dll;
 
-  if (!EnvQueryStr(google_update::kEnvProductVersionKey, version)) {
+  if (!EnvQueryStr(
+          BrowserDistribution::GetDistribution()->GetEnvVersionKey().c_str(),
+          version)) {
     std::wstring reg_path(GetRegistryPath());
     // Look into the registry to find the latest version.
     if (!GetVersion(dir.c_str(), reg_path.c_str(), version))
@@ -183,8 +185,9 @@
   if (!dll_)
     return ResultCodes::MISSING_DATA;
 
-  ::SetEnvironmentVariableW(google_update::kEnvProductVersionKey,
-                            version.c_str());
+  ::SetEnvironmentVariableW(
+      BrowserDistribution::GetDistribution()->GetEnvVersionKey().c_str(),
+      version.c_str());
 
   InitCrashReporterWithDllPath(file);
   OnBeforeLaunch(version);