chrome/installer/util/helper.cc - Issue 300593002: Make omaha, gcapi and uninstall registry accesses use Wow6432Node on 64-bit

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/installer/util/helper.cc

Issue 300593002: Make omaha, gcapi and uninstall registry accesses use Wow6432Node on 64-bit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: move the uninstall registry access to 32-bit Created 6 years, 7 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

« chrome/installer/util/compat_checks.cc ('K') | « chrome/installer/util/google_update_settings.cc ('k') | chrome/installer/util/install_util.cc » ('j') | chrome/installer/util/installation_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/helper.cc

diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc

index f76213ded3df6d71a8492bc5007ab018e3020b07..610ce99bdf8abae67e014c07e16685b26b1c8b99 100644

--- a/chrome/installer/util/helper.cc

+++ b/chrome/installer/util/helper.cc

@@ -17,7 +17,14 @@ namespace installer {

base::FilePath GetChromeInstallPath(bool system_install,

BrowserDistribution* dist) {

base::FilePath install_path;

+#if defined(_WIN64)

+ // TODO(wfh): Place Chrome binaries into DIR_PROGRAM_FILESX86 until the code

+ // to support moving the binaries is added.

+ int key = system_install ? base::DIR_PROGRAM_FILESX86 :

+ base::DIR_LOCAL_APP_DATA;

+#else

int key = system_install ? base::DIR_PROGRAM_FILES : base::DIR_LOCAL_APP_DATA;

+#endif

if (PathService::Get(key, &install_path)) {

install_path = install_path.Append(dist->GetInstallSubDir());

install_path = install_path.Append(kInstallBinaryDir);