summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-26 23:00:00 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-26 23:00:00 +0000
commitb95ad2e8729e8c31d2dc919f74ff5843057168ba (patch)
tree3239e56be47ddfad4eced6d89de6b8b5037d7e5c /chrome/installer
parent2a58420b7c51fc7649d88b475a324385683c4106 (diff)
downloadchromium_src-b95ad2e8729e8c31d2dc919f74ff5843057168ba.zip
chromium_src-b95ad2e8729e8c31d2dc919f74ff5843057168ba.tar.gz
chromium_src-b95ad2e8729e8c31d2dc919f74ff5843057168ba.tar.bz2
Do not write magic string to registry for non Google Chrome builds.
BUG=15410 Review URL: http://codereview.chromium.org/147216 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/mini_installer/mini_installer.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc
index 09df494..6567086 100644
--- a/chrome/installer/mini_installer/mini_installer.cc
+++ b/chrome/installer/mini_installer/mini_installer.cc
@@ -505,11 +505,13 @@ int WMain(HMODULE module) {
if (!GetWorkDir(module, base_path))
return 101;
+#if defined(GOOGLE_CHROME_BUILD)
// Set the magic suffix in registry to try full installer next time. We ignore
// any errors here and we try to set the suffix for user level as well as
- // system level.
+ // system level. This only applies to Google Chrome distribution.
SetFullInstallerFlag(HKEY_LOCAL_MACHINE);
SetFullInstallerFlag(HKEY_CURRENT_USER);
+#endif
wchar_t archive_path[MAX_PATH] = {0};
wchar_t setup_path[MAX_PATH] = {0};