* Need to read version from registry if relaunching browser.

BUG=4316

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

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

1 files changed, 3 insertions, 4 deletions

diff --git a/chrome/app/google_update_client.cc b/chrome/app/google_update_client.cc
index 1c8c2df..65acec6 100755
--- a/chrome/app/google_update_client.cc
+++ b/chrome/app/google_update_client.cc
@@ -12,8 +12,6 @@
 #include "chrome/installer/util/install_util.h"
 
 namespace {
-const wchar_t kEnvProductVersionKey[] = L"CHROME_VERSION";
-
 // Allocates the out param on success.
 bool GoogleUpdateEnvQueryStr(const wchar_t* key_name, wchar_t** out) {
   DWORD count = ::GetEnvironmentVariableW(key_name, NULL, 0);
@@ -57,7 +55,7 @@ bool GoogleUpdateClient::Launch(HINSTANCE instance,
     ::SetCurrentDirectory(dll_path_);
     // Setting the version on the environment block is a 'best effort' deal.
     // It enables Google Update running on a child to load the same DLL version.
-    ::SetEnvironmentVariableW(kEnvProductVersionKey, version_);
+    ::SetEnvironmentVariableW(google_update::kEnvProductVersionKey, version_);
   }
 
   // The dll can be in the exe's directory or in the current directory.
@@ -113,7 +111,8 @@ bool GoogleUpdateClient::Init(const wchar_t* client_guid,
   dll_.assign(client_dll);
   bool ret = false;
   if (!guid_.empty()) {
-    if (GoogleUpdateEnvQueryStr(kEnvProductVersionKey, &version_)) {
+    if (GoogleUpdateEnvQueryStr(google_update::kEnvProductVersionKey,
+                                &version_)) {
       ret = true;
     } else {
       std::wstring key(google_update::kRegPathClients);