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

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

Issue 2594113002: Remove multi-install from installer_util. (Closed)
Patch Set: go Created 3 years, 11 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/master_preferences.h ('k') | chrome/installer/util/master_preferences_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 ef58f813e6e8a49837c589e9d7f016761dedfc1e..2f7ccb696098ecf766689e8fc515caf039eacc72 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -163,12 +163,10 @@ void MasterPreferences::InitializeFromCommandLine(
}
// Strip multi-install from the dictionary, if present. This ensures that any
- // code that probes the dictionary directly to check for multi-install (rather
- // than calling is_multi_install()) receives false. The updated dictionary is
- // not written back to disk.
- master_dictionary_->Remove(std::string(master_preferences::kDistroDict) +
- '.' + master_preferences::kMultiInstall,
- nullptr);
+ // code that probes the dictionary directly to check for multi-install
+ // receives false. The updated dictionary is not written back to disk.
+ master_dictionary_->Remove(
+ std::string(master_preferences::kDistroDict) + ".multi_install", nullptr);
// Cache a pointer to the distribution dictionary. Ignore errors if any.
master_dictionary_->GetDictionary(installer::master_preferences::kDistroDict,
« no previous file with comments | « chrome/installer/util/master_preferences.h ('k') | chrome/installer/util/master_preferences_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698