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

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: rebase 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
« no previous file with comments | « chrome/installer/util/google_update_settings.cc ('k') | chrome/installer/util/install_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..a62ce6a055b04b43c96c919cc8ccef2165091e1a 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);
« no previous file with comments | « chrome/installer/util/google_update_settings.cc ('k') | chrome/installer/util/install_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698