diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 01:02:40 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 01:02:40 +0000 |
| commit | e3824ece8d9ded9ca98a976d2d023cb5e7c297fc (patch) | |
| tree | 3e20e470e74b3952edf348ba8a581d6a50d33cf4 /chrome/common | |
| parent | eb8d7e135f48668d0fcaf319e55af9805c545baa (diff) | |
| download | chromium_src-e3824ece8d9ded9ca98a976d2d023cb5e7c297fc.zip chromium_src-e3824ece8d9ded9ca98a976d2d023cb5e7c297fc.tar.gz chromium_src-e3824ece8d9ded9ca98a976d2d023cb5e7c297fc.tar.bz2 | |
Don't accidentally propagate Omaha variable to child processes.
Short term fix to issue 174203 (when Chrome is launched by Omaha post-install, it fails when attempting to install the App Launcher).
Should be reverted when issue 174953 is fixed and widely deployed.
R=brettw
BUG=174203,174953
TEST=SET GoogleUpdateIsMachine=1 and then launch chrome.exe. Using procexp, verify that the environment variable is not present in the running process.
Review URL: https://chromiumcodereview.appspot.com/12223044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/env_vars.cc | 7 | ||||
| -rw-r--r-- | chrome/common/env_vars.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/chrome/common/env_vars.cc b/chrome/common/env_vars.cc index 06e10f8..063d15b 100644 --- a/chrome/common/env_vars.cc +++ b/chrome/common/env_vars.cc @@ -32,4 +32,11 @@ const char kLtrLocale[] = "LEFT_TO_RIGHT"; // Number of times to run a given startup_tests unit test. const char kStartupTestsNumCycles[] = "STARTUP_TESTS_NUMCYCLES"; +// The presence of this environment variable with a value of 1 implies that +// setup.exe should run as a system installation regardless of what is on the +// command line. +// TODO(erikwright): Put this in chrome/installer/util/util_constants.cc when +// http://crbug.com/174953 is fixed and widely deployed. +const char kGoogleUpdateIsMachineEnvVar[] = "GoogleUpdateIsMachine"; + } // namespace env_vars diff --git a/chrome/common/env_vars.h b/chrome/common/env_vars.h index 0b3ba6f..34e1e17 100644 --- a/chrome/common/env_vars.h +++ b/chrome/common/env_vars.h @@ -18,6 +18,11 @@ extern const char kRtlLocale[]; extern const char kLtrLocale[]; extern const char kStartupTestsNumCycles[]; +// Google Update named environment variable that implies kSystemLevel. +// TODO(erikwright): Put this in chrome/installer/util/util_constants.h when +// http://crbug.com/174953 is fixed and widely deployed. +extern const char kGoogleUpdateIsMachineEnvVar[]; + } // namespace env_vars #endif // CHROME_COMMON_ENV_VARS_H__ |