summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/setup/setup_main.cc2
-rw-r--r--chrome/installer/setup/uninstall.cc4
-rw-r--r--chrome/installer/util/channel_info.cc11
-rw-r--r--chrome/installer/util/channel_info.h7
-rw-r--r--chrome/installer/util/channel_info_unittest.cc38
-rw-r--r--chrome/installer/util/google_update_settings.cc6
-rw-r--r--chrome/installer/util/google_update_settings.h3
-rw-r--r--chrome/installer/util/google_update_settings_unittest.cc8
-rw-r--r--chrome/installer/util/master_preferences.cc17
-rw-r--r--chrome/installer/util/master_preferences.h5
-rw-r--r--chrome/installer/util/master_preferences_constants.cc1
-rw-r--r--chrome/installer/util/master_preferences_constants.h3
-rw-r--r--chrome/installer/util/master_preferences_unittest.cc37
-rw-r--r--chrome/installer/util/util_constants.cc5
-rw-r--r--chrome/installer/util/util_constants.h1
15 files changed, 17 insertions, 131 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index dff6a02..c6d6b8a 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -367,7 +367,7 @@ bool CheckMultiInstallConditions(const InstallationState& original_state,
// We're being asked to install Chrome with Chrome Frame in ready-mode.
// This is an optimistic operation: if a SxS install of Chrome Frame
// is already present, don't touch it; if a multi-install of Chrome
- // Frame is present, preserve its settings (ready-mode, CEEE).
+ // Frame is present, preserve its settings (ready-mode).
if (cf_state != NULL) {
installer_state->RemoveProduct(chrome_frame);
chrome_frame = NULL;
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 08f53b7..9c25fc3 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -49,7 +49,7 @@ namespace {
// Makes appropriate changes to the Google Update "ap" value in the registry.
// Specifically, removes the flags associated with this product ("-chrome" or
-// "-chromeframe[-CEEE][-readymode]") from the "ap" values for all other
+// "-chromeframe[-readymode]") from the "ap" values for all other
// installed products and for the multi-installer package.
void ProcessGoogleUpdateItems(
const installer::InstallationState& original_state,
@@ -698,7 +698,7 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
if (force_uninstall) {
// Since --force-uninstall command line option is used, we are going to
// do silent uninstall. Try to close all running Chrome instances.
- // NOTE: We don't do this for Chrome Frame or CEEE.
+ // NOTE: We don't do this for Chrome Frame.
if (is_chrome)
CloseAllChromeProcesses();
} else if (is_chrome) {
diff --git a/chrome/installer/util/channel_info.cc b/chrome/installer/util/channel_info.cc
index 172ac7b..72ea0a3 100644
--- a/chrome/installer/util/channel_info.cc
+++ b/chrome/installer/util/channel_info.cc
@@ -14,7 +14,6 @@ namespace {
const wchar_t kChannelBeta[] = L"beta";
const wchar_t kChannelDev[] = L"dev";
-const wchar_t kModCeee[] = L"-CEEE";
const wchar_t kModChrome[] = L"-chrome";
const wchar_t kModChromeFrame[] = L"-chromeframe";
const wchar_t kModMultiInstall[] = L"-multi";
@@ -33,7 +32,6 @@ const wchar_t* const kModifiers[] = {
kModMultiInstall,
kModChrome,
kModChromeFrame,
- kModCeee,
kModReadyMode,
kSfxMultiFail,
kSfxFull
@@ -44,7 +42,6 @@ enum ModifierIndex {
MOD_MULTI_INSTALL,
MOD_CHROME,
MOD_CHROME_FRAME,
- MOD_CEEE,
MOD_READY_MODE,
SFX_MULTI_FAIL,
SFX_FULL,
@@ -181,14 +178,6 @@ bool ChannelInfo::GetChannelName(std::wstring* channel_name) const {
return false;
}
-bool ChannelInfo::IsCeee() const {
- return HasModifier(MOD_CEEE, value_);
-}
-
-bool ChannelInfo::SetCeee(bool value) {
- return SetModifier(MOD_CEEE, value, &value_);
-}
-
bool ChannelInfo::IsChrome() const {
return HasModifier(MOD_CHROME, value_);
}
diff --git a/chrome/installer/util/channel_info.h b/chrome/installer/util/channel_info.h
index d1c8e95..44d3fae 100644
--- a/chrome/installer/util/channel_info.h
+++ b/chrome/installer/util/channel_info.h
@@ -44,13 +44,6 @@ class ChannelInfo {
// determined.
bool GetChannelName(std::wstring* channel_name) const;
- // Returns true if the -CEEE modifier is present in the value.
- bool IsCeee() const;
-
- // Adds or removes the -CEEE modifier, returning true if the value is
- // modified.
- bool SetCeee(bool value);
-
// Returns true if the -chrome modifier is present in the value.
bool IsChrome() const;
diff --git a/chrome/installer/util/channel_info_unittest.cc b/chrome/installer/util/channel_info_unittest.cc
index 2a015cc..d68078e 100644
--- a/chrome/installer/util/channel_info_unittest.cc
+++ b/chrome/installer/util/channel_info_unittest.cc
@@ -25,12 +25,6 @@ TEST(ChannelInfoTest, Channels) {
ci.set_value(L"");
EXPECT_TRUE(ci.GetChannelName(&channel));
EXPECT_EQ(kChannelStable, channel);
- ci.set_value(L"-CEEE");
- EXPECT_TRUE(ci.GetChannelName(&channel));
- EXPECT_EQ(kChannelStable, channel);
- ci.set_value(L"-CEEE-multi");
- EXPECT_TRUE(ci.GetChannelName(&channel));
- EXPECT_EQ(kChannelStable, channel);
ci.set_value(L"-full");
EXPECT_TRUE(ci.GetChannelName(&channel));
EXPECT_EQ(kChannelStable, channel);
@@ -59,38 +53,6 @@ TEST(ChannelInfoTest, Channels) {
EXPECT_FALSE(ci.GetChannelName(&channel));
}
-TEST(ChannelInfoTest, CEEE) {
- ChannelInfo ci;
-
- ci.set_value(L"");
- EXPECT_TRUE(ci.SetCeee(true));
- EXPECT_TRUE(ci.IsCeee());
- EXPECT_EQ(L"-CEEE", ci.value());
- EXPECT_FALSE(ci.SetCeee(true));
- EXPECT_TRUE(ci.IsCeee());
- EXPECT_EQ(L"-CEEE", ci.value());
- EXPECT_TRUE(ci.SetCeee(false));
- EXPECT_FALSE(ci.IsCeee());
- EXPECT_EQ(L"", ci.value());
- EXPECT_FALSE(ci.SetCeee(false));
- EXPECT_FALSE(ci.IsCeee());
- EXPECT_EQ(L"", ci.value());
-
- ci.set_value(L"2.0-beta");
- EXPECT_TRUE(ci.SetCeee(true));
- EXPECT_TRUE(ci.IsCeee());
- EXPECT_EQ(L"2.0-beta-CEEE", ci.value());
- EXPECT_FALSE(ci.SetCeee(true));
- EXPECT_TRUE(ci.IsCeee());
- EXPECT_EQ(L"2.0-beta-CEEE", ci.value());
- EXPECT_TRUE(ci.SetCeee(false));
- EXPECT_FALSE(ci.IsCeee());
- EXPECT_EQ(L"2.0-beta", ci.value());
- EXPECT_FALSE(ci.SetCeee(false));
- EXPECT_FALSE(ci.IsCeee());
- EXPECT_EQ(L"2.0-beta", ci.value());
-}
-
TEST(ChannelInfoTest, FullInstall) {
ChannelInfo ci;
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index babd396..2579be6 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -123,14 +123,14 @@ EulaSearchResult HasEULASetting(HKEY root, const std::wstring& state_key,
bool GetChromeChannelInternal(bool system_install,
bool add_multi_modifier,
- std::wstring* channel) {
+ string16* channel) {
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
if (dist->GetChromeChannel(channel)) {
return true;
}
HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
- std::wstring reg_path = dist->GetStateKey();
+ string16 reg_path = dist->GetStateKey();
RegKey key(root_key, reg_path.c_str(), KEY_READ);
installer::ChannelInfo channel_info;
@@ -376,7 +376,7 @@ std::wstring GoogleUpdateSettings::GetChromeChannel(bool system_install) {
}
bool GoogleUpdateSettings::GetChromeChannelAndModifiers(bool system_install,
- std::wstring* channel) {
+ string16* channel) {
return GetChromeChannelInternal(system_install, true, channel);
}
diff --git a/chrome/installer/util/google_update_settings.h b/chrome/installer/util/google_update_settings.h
index ed84dfb..ab3ccd8 100644
--- a/chrome/installer/util/google_update_settings.h
+++ b/chrome/installer/util/google_update_settings.h
@@ -9,6 +9,7 @@
#include <string>
#include "base/basictypes.h"
+#include "base/string16.h"
#include "chrome/installer/util/util_constants.h"
class BrowserDistribution;
@@ -123,7 +124,7 @@ class GoogleUpdateSettings {
// it is a multi-install product, in which case it will return "m",
// "unknown-m", "dev-m", or "beta-m").
static bool GetChromeChannelAndModifiers(bool system_install,
- std::wstring* channel);
+ string16* channel);
// This method changes the Google Update "ap" value to move the installation
// on to or off of one of the recovery channels.
diff --git a/chrome/installer/util/google_update_settings_unittest.cc b/chrome/installer/util/google_update_settings_unittest.cc
index ffedf51..69348b6 100644
--- a/chrome/installer/util/google_update_settings_unittest.cc
+++ b/chrome/installer/util/google_update_settings_unittest.cc
@@ -130,7 +130,7 @@ class GoogleUpdateSettingsTest: public testing::Test {
const wchar_t* channel = expectations[j].channel;
SetApField(install, ap.c_str());
- std::wstring ret_channel;
+ string16 ret_channel;
EXPECT_TRUE(GoogleUpdateSettings::GetChromeChannelAndModifiers(
is_system, &ret_channel));
@@ -189,7 +189,7 @@ class GoogleUpdateSettingsTest: public testing::Test {
// whether per-system or per-user install.
TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelAbsent) {
// Per-system first.
- std::wstring channel;
+ string16 channel;
EXPECT_TRUE(GoogleUpdateSettings::GetChromeChannelAndModifiers(true,
&channel));
EXPECT_STREQ(L"", channel.c_str());
@@ -203,7 +203,7 @@ TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelAbsent) {
// Test an empty Ap key for system and user.
TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelEmptySystem) {
SetApField(SYSTEM_INSTALL, L"");
- std::wstring channel;
+ string16 channel;
EXPECT_TRUE(GoogleUpdateSettings::GetChromeChannelAndModifiers(true,
&channel));
EXPECT_STREQ(L"", channel.c_str());
@@ -217,7 +217,7 @@ TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelEmptySystem) {
TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelEmptyUser) {
SetApField(USER_INSTALL, L"");
// Per-system lookups still succeed and return empty string.
- std::wstring channel;
+ string16 channel;
EXPECT_TRUE(GoogleUpdateSettings::GetChromeChannelAndModifiers(true,
&channel));
EXPECT_STREQ(L"", channel.c_str());
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index f004333..573fd84 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -80,7 +80,6 @@ namespace installer {
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() : distribution_(NULL),
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 CommandLine& 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));
@@ -137,8 +135,6 @@ void MasterPreferences::InitializeFromCommandLine(const CommandLine& cmd_line) {
} 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 @@ 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
@@ -226,14 +220,7 @@ void MasterPreferences::InitializeProductFlags() {
// 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;
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index 2c7a068..739ad1b 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -162,10 +162,6 @@ class MasterPreferences {
return preferences_read_from_file_;
}
- bool install_ceee() const {
- return ceee_;
- }
-
bool install_chrome() const {
return chrome_;
}
@@ -193,7 +189,6 @@ class MasterPreferences {
scoped_ptr<base::DictionaryValue> master_dictionary_;
base::DictionaryValue* distribution_;
bool preferences_read_from_file_;
- bool ceee_;
bool chrome_;
bool chrome_frame_;
bool multi_install_;
diff --git a/chrome/installer/util/master_preferences_constants.cc b/chrome/installer/util/master_preferences_constants.cc
index c1c353f..e2d0a6b 100644
--- a/chrome/installer/util/master_preferences_constants.cc
+++ b/chrome/installer/util/master_preferences_constants.cc
@@ -9,7 +9,6 @@ namespace master_preferences {
const char kAltFirstRunBubble[] = "oem_bubble";
const char kAltShortcutText[] = "alternate_shortcut_text";
const char kAutoLaunchChrome[] = "auto_launch_chrome";
- const char kCeee[] = "ceee";
const char kChrome[] = "chrome";
const char kChromeFrame[] = "chrome_frame";
const char kChromeFrameReadyMode[] = "ready_mode";
diff --git a/chrome/installer/util/master_preferences_constants.h b/chrome/installer/util/master_preferences_constants.h
index fb0acd89..b22649e 100644
--- a/chrome/installer/util/master_preferences_constants.h
+++ b/chrome/installer/util/master_preferences_constants.h
@@ -23,9 +23,6 @@ extern const char kAltFirstRunBubble[];
// Boolean. Whether to instruct the installer to auto-launch chrome on computer
// startup. The default (if not provided) is |false|.
extern const char kAutoLaunchChrome[];
-// Boolean. CEEE features of Chrome Frame should be enabled as part of
-// the install. Requires kChromeFrame to be specified as well.
-extern const char kCeee[];
// Boolean. This is to be a Chrome install. (When using MultiInstall)
extern const char kChrome[];
// Boolean. This is to be a Chrome Frame install.
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
index b5972ce..fd061e8e 100644
--- a/chrome/installer/util/master_preferences_unittest.cc
+++ b/chrome/installer/util/master_preferences_unittest.cc
@@ -303,87 +303,54 @@ TEST_F(MasterPreferencesTest, GetInstallPreferencesTest) {
}
TEST_F(MasterPreferencesTest, TestDefaultInstallConfig) {
- std::wstringstream chrome_cmd, cf_cmd, ceee_cmd;
+ std::wstringstream chrome_cmd, cf_cmd;
chrome_cmd << "setup.exe";
cf_cmd << "setup.exe --" << installer::switches::kChromeFrame;
- ceee_cmd << "setup.exe --" << installer::switches::kCeee;
CommandLine chrome_install(CommandLine::FromString(chrome_cmd.str()));
CommandLine cf_install(CommandLine::FromString(cf_cmd.str()));
- CommandLine ceee_install(CommandLine::FromString(ceee_cmd.str()));
installer::MasterPreferences pref_chrome(chrome_install);
installer::MasterPreferences pref_cf(cf_install);
- installer::MasterPreferences pref_ceee(ceee_install);
EXPECT_FALSE(pref_chrome.is_multi_install());
EXPECT_TRUE(pref_chrome.install_chrome());
- EXPECT_FALSE(pref_chrome.install_ceee());
EXPECT_FALSE(pref_chrome.install_chrome_frame());
EXPECT_FALSE(pref_cf.is_multi_install());
EXPECT_FALSE(pref_cf.install_chrome());
- EXPECT_FALSE(pref_cf.install_ceee());
EXPECT_TRUE(pref_cf.install_chrome_frame());
-
- EXPECT_FALSE(pref_ceee.is_multi_install());
- EXPECT_FALSE(pref_ceee.install_chrome());
- EXPECT_TRUE(pref_ceee.install_ceee());
- EXPECT_TRUE(pref_ceee.install_chrome_frame());
}
TEST_F(MasterPreferencesTest, TestMultiInstallConfig) {
using installer::switches::kMultiInstall;
using installer::switches::kChrome;
using installer::switches::kChromeFrame;
- using installer::switches::kCeee;
- std::wstringstream chrome_cmd, cf_cmd, ceee_cmd, chrome_cf_cmd,
- chrome_ceee_cf_cmd;
+ std::wstringstream chrome_cmd, cf_cmd, chrome_cf_cmd;
chrome_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome;
cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChromeFrame;
- ceee_cmd << "setup.exe --" << kMultiInstall << " --" << kCeee;
chrome_cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome <<
" --" << kChromeFrame;
- chrome_ceee_cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome <<
- " --" << kChromeFrame << " --" << kCeee;
CommandLine chrome_install(CommandLine::FromString(chrome_cmd.str()));
CommandLine cf_install(CommandLine::FromString(cf_cmd.str()));
- CommandLine ceee_install(CommandLine::FromString(ceee_cmd.str()));
CommandLine chrome_cf_install(CommandLine::FromString(chrome_cf_cmd.str()));
- CommandLine chrome_cf_ceee_install(
- CommandLine::FromString(chrome_ceee_cf_cmd.str()));
installer::MasterPreferences pref_chrome(chrome_install);
installer::MasterPreferences pref_cf(cf_install);
- installer::MasterPreferences pref_ceee(ceee_install);
installer::MasterPreferences pref_chrome_cf(chrome_cf_install);
- installer::MasterPreferences pref_all(chrome_cf_ceee_install);
EXPECT_TRUE(pref_chrome.is_multi_install());
EXPECT_TRUE(pref_chrome.install_chrome());
- EXPECT_FALSE(pref_chrome.install_ceee());
EXPECT_FALSE(pref_chrome.install_chrome_frame());
EXPECT_TRUE(pref_cf.is_multi_install());
EXPECT_FALSE(pref_cf.install_chrome());
- EXPECT_FALSE(pref_cf.install_ceee());
EXPECT_TRUE(pref_cf.install_chrome_frame());
- EXPECT_TRUE(pref_ceee.is_multi_install());
- EXPECT_FALSE(pref_ceee.install_chrome());
- EXPECT_TRUE(pref_ceee.install_ceee());
- EXPECT_TRUE(pref_ceee.install_chrome_frame());
-
EXPECT_TRUE(pref_chrome_cf.is_multi_install());
EXPECT_TRUE(pref_chrome_cf.install_chrome());
- EXPECT_FALSE(pref_chrome_cf.install_ceee());
EXPECT_TRUE(pref_chrome_cf.install_chrome_frame());
-
- EXPECT_TRUE(pref_all.is_multi_install());
- EXPECT_TRUE(pref_all.install_chrome());
- EXPECT_TRUE(pref_all.install_ceee());
- EXPECT_TRUE(pref_all.install_chrome_frame());
}
diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc
index 9dab113..b2287c3 100644
--- a/chrome/installer/util/util_constants.cc
+++ b/chrome/installer/util/util_constants.cc
@@ -11,9 +11,6 @@ namespace switches {
// Whether to set Chrome to launch at computer startup.
const char kAutoLaunchChrome[] = "auto-launch-chrome";
-// Install CEEE.
-const char kCeee[] = "ceee";
-
// Install Chrome.
// Currently this is only required when used in combination with kMultiInstall.
const char kChrome[] = "chrome";
@@ -98,7 +95,7 @@ const char kMakeChromeDefault[] = "make-chrome-default";
const char kMsi[] = "msi";
// Tells installer to install multiple products specified on the command line.
-// (e.g. Chrome Frame, CEEE, Chrome)
+// (e.g. Chrome Frame, Chrome)
const char kMultiInstall[] = "multi-install";
// Useful only when used with --update-setup-exe, otherwise ignored. It
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index 066edb8f..d8da379 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -123,7 +123,6 @@ COMPILE_ASSERT(CONFIGURE_AUTO_LAUNCH == 16,
namespace switches {
extern const char kAutoLaunchChrome[];
-extern const char kCeee[];
extern const char kChrome[];
extern const char kChromeFrame[];
extern const char kChromeFrameQuickEnable[];
generated by cgit v1.1 at 2024-12-24 01:50:44 +0000