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

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

Issue 12223044: Don't accidentally propagate Omaha variable to child processes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix a silly mistake. Created 7 years, 10 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/common/env_vars.cc ('k') | chrome/installer/util/util_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/master_preferences.cc
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index 776a3c8c6b001549c2fee6697fbb8ed69939ca31..c89d1ff31c4ce734b372dd7a0c1dbdc763f0ada2 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "base/path_service.h"
#include "base/string_util.h"
+#include "chrome/common/env_vars.h"
#include "chrome/installer/util/master_preferences_constants.h"
#include "chrome/installer/util/util_constants.h"
#include "googleurl/src/gurl.h"
@@ -201,7 +202,7 @@ void MasterPreferences::InitializeFromCommandLine(const CommandLine& cmd_line) {
scoped_ptr<base::Environment> env(base::Environment::Create());
if (env != NULL) {
std::string is_machine_var;
- env->GetVar(kGoogleUpdateIsMachineEnvVar, &is_machine_var);
+ env->GetVar(env_vars::kGoogleUpdateIsMachineEnvVar, &is_machine_var);
if (!is_machine_var.empty() && is_machine_var[0] == '1') {
VLOG(1) << "Taking system-level from environment.";
name.assign(installer::master_preferences::kDistroDict);
« no previous file with comments | « chrome/common/env_vars.cc ('k') | chrome/installer/util/util_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698