Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/master_preferences.cc

 // Copyright (c) 2012 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_string_value_serializer.h"
 #include "base/lazy_instance.h"
@@ skipping 57 matching lines @@
 }
 
 }  // namespace
 
 namespace installer {
 
 MasterPreferences::MasterPreferences() : distribution_(NULL),
                                          preferences_read_from_file_(false),
                                          chrome_(true),
                                          chrome_app_launcher_(false),
-                                         chrome_frame_(false),
                                          multi_install_(false) {
   InitializeFromCommandLine(*CommandLine::ForCurrentProcess());
 }
 
 MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
     : distribution_(NULL),
       preferences_read_from_file_(false),
       chrome_(true),
       chrome_app_launcher_(false),
-      chrome_frame_(false),
       multi_install_(false) {
   InitializeFromCommandLine(cmd_line);
 }
 
 MasterPreferences::MasterPreferences(const base::FilePath& prefs_path)
     : distribution_(NULL),
       preferences_read_from_file_(false),
       chrome_(true),
       chrome_app_launcher_(false),
-      chrome_frame_(false),
       multi_install_(false) {
   std::string json_data;
   // Failure to read the file is ignored as |json_data| will be the empty string
   // and the remainder of this MasterPreferences object should still be
   // initialized as best as possible.
   if (base::PathExists(prefs_path) &&
       !base::ReadFileToString(prefs_path, &json_data)) {
     LOG(ERROR) << "Failed to read preferences from " << prefs_path.value();
   }
   if (InitializeFromString(json_data))
     preferences_read_from_file_ = true;
 }
 
 MasterPreferences::MasterPreferences(const std::string& prefs)
     : distribution_(NULL),
       preferences_read_from_file_(false),
       chrome_(true),
       chrome_app_launcher_(false),
-      chrome_frame_(false),
       multi_install_(false) {
   InitializeFromString(prefs);
 }
 
 MasterPreferences::~MasterPreferences() {
 }
 
 void MasterPreferences::InitializeFromCommandLine(const CommandLine& cmd_line) {
 #if defined(OS_WIN)
   if (cmd_line.HasSwitch(installer::switches::kInstallerData)) {
@@ skipping 14 matching lines @@
     const char* distribution_switch;
   } translate_switches[] = {
     { installer::switches::kAutoLaunchChrome,
       installer::master_preferences::kAutoLaunchChrome },
     { installer::switches::kChromeAppHostDeprecated,
       installer::master_preferences::kChromeAppHostDeprecated },
     { installer::switches::kChromeAppLauncher,
       installer::master_preferences::kChromeAppLauncher },
     { installer::switches::kChrome,
       installer::master_preferences::kChrome },
-    { installer::switches::kChromeFrame,
-      installer::master_preferences::kChromeFrame },
     { installer::switches::kDisableLogging,
       installer::master_preferences::kDisableLogging },
     { installer::switches::kMsi,
       installer::master_preferences::kMsi },
     { installer::switches::kMultiInstall,
       installer::master_preferences::kMultiInstall },
     { installer::switches::kDoNotRegisterForUpdateLaunch,
       installer::master_preferences::kDoNotRegisterForUpdateLaunch },
     { installer::switches::kDoNotLaunchChrome,
       installer::master_preferences::kDoNotLaunchChrome },
@@ skipping 60 matching lines @@
   }
 
   InitializeProductFlags();
   EnforceLegacyPreferences();
   return data_is_valid;
 }
 
 void MasterPreferences::InitializeProductFlags() {
   // Make sure we start out with the correct defaults.
   multi_install_ = false;
-  chrome_frame_ = false;
   chrome_app_launcher_ = false;
   chrome_ = true;
 
   GetBool(installer::master_preferences::kMultiInstall, &multi_install_);
-  GetBool(installer::master_preferences::kChromeFrame, &chrome_frame_);
 
   GetBool(installer::master_preferences::kChromeAppLauncher,
           &chrome_app_launcher_);
 
   // The deprecated switch --app-host behaves like --app-launcher.
   bool chrome_app_host = false;
   GetBool(installer::master_preferences::kChromeAppHostDeprecated,
           &chrome_app_host);
   chrome_app_launcher_ = chrome_app_launcher_ || chrome_app_host;
 
   // 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.
+  // When multi-install is not set, operate on Chrome.
   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_;
+    chrome_ = true;
   }
 }
 
 void MasterPreferences::EnforceLegacyPreferences() {
   // If create_all_shortcuts was explicitly set to false, set
   // do_not_create_(desktop|quick_launch)_shortcut to true.
   bool create_all_shortcuts = true;
   GetBool(installer::master_preferences::kCreateAllShortcuts,
           &create_all_shortcuts);
   if (!create_all_shortcuts) {
@@ skipping 54 matching lines @@
   master_dictionary_->GetString(prefs::kVariationsSeed, &variations_seed);
   return variations_seed;
 }
 
 // static
 const MasterPreferences& MasterPreferences::ForCurrentProcess() {
   return g_master_preferences.Get();
 }
 
 }  // namespace installer