Remove remaining references to CEEE.

chrome/installer/util/master_preferences.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/util/master_preferences.h"
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/json/json_value_serializer.h"
 #include "base/lazy_instance.h"
@@ skipping 62 matching lines @@
   }
   return static_cast<DictionaryValue*>(root.release());
 }
 
 }  // namespace
 
 namespace installer {
 
 MasterPreferences::MasterPreferences() : distribution_(NULL),
                                          preferences_read_from_file_(false),
-                                         ceee_(false),
                                          chrome_(true),
                                          chrome_frame_(false),
                                          multi_install_(false) {
   InitializeFromCommandLine(*CommandLine::ForCurrentProcess());
 }
 
 MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
     : distribution_(NULL),
       preferences_read_from_file_(false),
-      ceee_(false),
       chrome_(true),
       chrome_frame_(false),
       multi_install_(false) {
   InitializeFromCommandLine(cmd_line);
 }
 
 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));
 
   if (!master_dictionary_.get()) {
     master_dictionary_.reset(new DictionaryValue());
   } else {
     preferences_read_from_file_ = true;
     // Cache a pointer to the distribution dictionary.
     master_dictionary_->GetDictionary(kDistroDict, &distribution_);
   }
@@ skipping 18 matching lines @@
 
   // A simple map from command line switches to equivalent switches in the
   // distribution dictionary.  Currently all switches added will be set to
   // 'true'.
   static const struct CmdLineSwitchToDistributionSwitch {
     const char* cmd_line_switch;
     const char* distribution_switch;
   } 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,
       installer::master_preferences::kChromeFrame },
     { installer::switches::kChromeFrameReadyMode,
       installer::master_preferences::kChromeFrameReadyMode },
     { installer::switches::kCreateAllShortcuts,
       installer::master_preferences::kCreateAllShortcuts },
     { installer::switches::kDisableLogging,
       installer::master_preferences::kDisableLogging },
@@ skipping 53 matching lines @@
   master_dictionary_->GetDictionary(kDistroDict, &distribution_);
 
   InitializeProductFlags();
 #endif
 }
 
 void MasterPreferences::InitializeProductFlags() {
   // 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
   // present on the command line.
   // Before multi-install was introduced however, we only supported installing
   // 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

[mad-corp, 2011/12/15 19:45:37]

Don't we want to keep the first part of the sentence? Isn't it ceee agnostic? In
doubt, maybe check with Robert Shield?

[grt (UTC plus 2), 2011/12/16 04:24:52]

Yes, please keep the first part (up to "...and Chrome Frame").  Thanks for
catching this, MAD.

[Roger Tawa OOO till Jul 10th, 2011/12/16 16:24:30]

Done.

[Roger Tawa OOO till Jul 10th, 2011/12/16 16:24:30]

Done.

-  // installation of CEEE with Chrome Frame.
-
-  // Regardless of multi install being present, CEEE always needs CF to
-  // be installed.
-  if (ceee_)
-    chrome_frame_ = true;
 
   if (multi_install_) {
     if (!GetBool(installer::master_preferences::kChrome, &chrome_))
       chrome_ = false;
   } else {
     // If chrome-frame is on the command line however, we only install CF.
     chrome_ = !chrome_frame_;
   }
 }
 
@@ skipping 26 matching lines @@
 bool MasterPreferences::GetExtensionsBlock(DictionaryValue** extensions) const {
   return master_dictionary_->GetDictionary(
       master_preferences::kExtensionsBlock, extensions);
 }
 
 // static
 const MasterPreferences& MasterPreferences::ForCurrentProcess() {
   return g_master_preferences.Get();
 }
 }  // installer_util