summaryrefslogtreecommitdiffstats
path: root/chrome/installer/launcher_support
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-12 19:24:04 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-12 19:24:04 +0000
commit3a01b1b03a9bfccaddf9266a1a77a3e283460a9e (patch)
tree486f65414fa43bd5f8732e4a06b480a82f1a7b4f /chrome/installer/launcher_support
parent1b6404832789ef7157155d0fba8d7ebb4148a28b (diff)
downloadchromium_src-3a01b1b03a9bfccaddf9266a1a77a3e283460a9e.zip
chromium_src-3a01b1b03a9bfccaddf9266a1a77a3e283460a9e.tar.gz
chromium_src-3a01b1b03a9bfccaddf9266a1a77a3e283460a9e.tar.bz2
Make chrome_launcher_support work correctly for 64bit binaries.
Google Update uses 32bit hive. When code executed in 64bit process, it checks 64bit hive and can't find chrome. Review URL: https://chromiumcodereview.appspot.com/11857012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/launcher_support')
-rw-r--r--chrome/installer/launcher_support/chrome_launcher_support.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/launcher_support/chrome_launcher_support.cc b/chrome/installer/launcher_support/chrome_launcher_support.cc
index d6ec9d6..5ca32dc 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.cc
+++ b/chrome/installer/launcher_support/chrome_launcher_support.cc
@@ -65,8 +65,9 @@ bool GetClientStateValue(InstallationLevel level,
string16 subkey(kGoogleRegClientStateKey);
subkey.append(1, L'\\').append(app_guid);
base::win::RegKey reg_key;
+ // Google Update always uses 32bit hive.
if (reg_key.Open(root_key, subkey.c_str(),
- KEY_QUERY_VALUE) == ERROR_SUCCESS) {
+ KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS) {
if (reg_key.ReadValue(value_name, value) == ERROR_SUCCESS) {
return true;
}