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

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

Issue 8909009: Remove remaining references to CEEE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync'ed, no new changes Created 9 years 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
===================================================================
--- chrome/installer/util/master_preferences.cc (revision 115109)
+++ chrome/installer/util/master_preferences.cc (working copy)
@@ -80,7 +80,6 @@
MasterPreferences::MasterPreferences() : distribution_(NULL),
preferences_read_from_file_(false),
- ceee_(false),
chrome_(true),
chrome_frame_(false),
multi_install_(false) {
@@ -90,7 +89,6 @@
MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
: distribution_(NULL),
preferences_read_from_file_(false),
- ceee_(false),
chrome_(true),
chrome_frame_(false),
multi_install_(false) {
@@ -98,7 +96,7 @@
}
MasterPreferences::MasterPreferences(const FilePath& prefs_path)
- : distribution_(NULL), preferences_read_from_file_(false), ceee_(false),
+ : distribution_(NULL), preferences_read_from_file_(false),
chrome_(true), chrome_frame_(false), multi_install_(false) {
master_dictionary_.reset(ParseDistributionPreferences(prefs_path));
@@ -137,8 +135,6 @@
} translate_switches[] = {
{ installer::switches::kAutoLaunchChrome,
installer::master_preferences::kAutoLaunchChrome },
- { installer::switches::kCeee,
- installer::master_preferences::kCeee },
{ installer::switches::kChrome,
installer::master_preferences::kChrome },
{ installer::switches::kChromeFrame,
@@ -212,12 +208,10 @@
// Make sure we start out with the correct defaults.
multi_install_ = false;
chrome_frame_ = false;
- ceee_ = false;
chrome_ = true;
GetBool(installer::master_preferences::kMultiInstall, &multi_install_);
GetBool(installer::master_preferences::kChromeFrame, &chrome_frame_);
- GetBool(installer::master_preferences::kCeee, &ceee_);
// When multi-install is specified, the checks are pretty simple (in theory):
// In order to be installed/uninstalled, each product must have its switch
@@ -226,14 +220,7 @@
// two products, Chrome and Chrome Frame. For the time being we need to
// continue to support this mode where multi-install is not set.
// So, when multi-install is not set, we continue to support mutually
- // exclusive installation of Chrome and Chrome Frame in addition to supporting
- // installation of CEEE with Chrome Frame.
-
- // Regardless of multi install being present, CEEE always needs CF to
- // be installed.
- if (ceee_)
- chrome_frame_ = true;
-
+ // exclusive installation of Chrome and Chrome Frame.
if (multi_install_) {
if (!GetBool(installer::master_preferences::kChrome, &chrome_))
chrome_ = false;
« 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