diff options
27 files changed, 48 insertions, 188 deletions
diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING index 8ffbb91..6c9dad5 100644 --- a/chrome/app/theme/chromium/BRANDING +++ b/chrome/app/theme/chromium/BRANDING @@ -2,5 +2,4 @@ COMPANY_FULLNAME=The Chromium Authors COMPANY_SHORTNAME=The Chromium Authors PRODUCT_FULLNAME=Chromium PRODUCT_SHORTNAME=Chromium -CEEE_PRODUCT_FULLNAME=Chromium Extensions Execution Environment COPYRIGHT=Copyright (C) 2006-2010 The Chromium Authors. All Rights Reserved. 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[]; diff --git a/chrome/version.h.in b/chrome/version.h.in index 924586c..ed4004b0 100644 --- a/chrome/version.h.in +++ b/chrome/version.h.in @@ -17,7 +17,6 @@ #define COMPANY_SHORTNAME_STRING "@COMPANY_SHORTNAME@" #define PRODUCT_FULLNAME_STRING "@PRODUCT_FULLNAME@" #define PRODUCT_SHORTNAME_STRING "@PRODUCT_SHORTNAME@" -#define CEEE_PRODUCT_FULLNAME_STRING "@CEEE_PRODUCT_FULLNAME@" #define COPYRIGHT_STRING "@COPYRIGHT@" #define OFFICIAL_BUILD_STRING "@OFFICIAL_BUILD@" diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 1ee9070..8e84714 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -1081,7 +1081,7 @@ bool ChromeActiveDocument::LaunchUrl(const ChromeFrameUrl& cf_url, // If no profile was given, then make use of the host process's name. if (profile.empty()) profile = GetHostProcessName(false); - return InitializeAutomation(profile, L"", IsIEInPrivate(), + return InitializeAutomation(profile, IsIEInPrivate(), false, cf_url.gurl(), GURL(referrer), false); } diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index 425cc2f..654f640 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -470,20 +470,10 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite( InitializeAutomationSettings(); - // To avoid http://code.google.com/p/chromium/issues/detail?id=63427, - // we always pass this flag needed by CEEE. It has no effect on - // normal CF operation. - // - // Extra arguments are passed on verbatim, so we add the -- prefix. - std::wstring chrome_extra_arguments(L"--"); - chrome_extra_arguments.append( - ASCIIToWide(switches::kEnableExperimentalExtensionApis)); - url_fetcher_->set_frame_busting(!is_privileged()); automation_client_->SetUrlFetcher(url_fetcher_.get()); - if (!InitializeAutomation(profile_name, chrome_extra_arguments, - IsIEInPrivate(), true, GURL(utf8_url), - GURL(), false)) { + if (!InitializeAutomation(profile_name, IsIEInPrivate(), true, + GURL(utf8_url), GURL(), false)) { DLOG(ERROR) << "Failed to navigate to url:" << utf8_url; return E_FAIL; } diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 2aae122..f6127dc 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -298,10 +298,6 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, command_line->AppendSwitchNative(switches::kLang, params->language()); command_line_string = command_line->GetCommandLineString(); - // If there are any extra arguments, append them to the command line. - if (!params->extra_arguments().empty()) { - command_line_string += L' ' + params->extra_arguments(); - } } automation_server_launch_start_time_ = base::TimeTicks::Now(); @@ -670,7 +666,7 @@ bool ChromeFrameAutomationClient::InitiateNavigation( FilePath profile_path; chrome_launch_params_ = new ChromeFrameLaunchParams(parsed_url, referrer_gurl, profile_path, L"", SimpleResourceLoader::GetLanguage(), - L"", false, false, route_all_top_level_navigations_); + false, false, route_all_top_level_navigations_); } else { chrome_launch_params_->set_referrer(referrer_gurl); chrome_launch_params_->set_url(parsed_url); diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index b1cef96..59060e3 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -111,14 +111,13 @@ class ChromeFrameLaunchParams : // NOLINT const FilePath& profile_path, const std::wstring& profile_name, const std::wstring& language, - const std::wstring& extra_arguments, bool incognito, bool widget_mode, bool route_all_top_level_navigations) : launch_timeout_(kCommandExecutionTimeout), url_(url), referrer_(referrer), profile_path_(profile_path), profile_name_(profile_name), language_(language), - extra_arguments_(extra_arguments), version_check_(true), - incognito_mode_(incognito), is_widget_mode_(widget_mode), + version_check_(true), incognito_mode_(incognito), + is_widget_mode_(widget_mode), route_all_top_level_navigations_(route_all_top_level_navigations) { } @@ -161,10 +160,6 @@ class ChromeFrameLaunchParams : // NOLINT return language_; } - const std::wstring& extra_arguments() const { - return extra_arguments_; - } - bool version_check() const { return version_check_; } @@ -197,7 +192,6 @@ class ChromeFrameLaunchParams : // NOLINT FilePath profile_path_; std::wstring profile_name_; std::wstring language_; - std::wstring extra_arguments_; bool version_check_; bool incognito_mode_; bool is_widget_mode_; diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h index 51106ab..a6066f9 100644 --- a/chrome_frame/chrome_frame_plugin.h +++ b/chrome_frame/chrome_frame_plugin.h @@ -66,7 +66,6 @@ END_MSG_MAP() } bool InitializeAutomation(const std::wstring& profile_name, - const std::wstring& extra_chrome_arguments, bool incognito, bool is_widget_mode, const GURL& url, const GURL& referrer, bool route_all_top_level_navigations) { @@ -83,8 +82,7 @@ END_MSG_MAP() FilePath actual_profile_name = profile_path.BaseName(); launch_params_ = new ChromeFrameLaunchParams(url, referrer, profile_path, actual_profile_name.value(), SimpleResourceLoader::GetLanguage(), - extra_chrome_arguments, incognito_mode, is_widget_mode, - route_all_top_level_navigations); + incognito_mode, is_widget_mode, route_all_top_level_navigations); return automation_client_->Initialize(this, launch_params_); } diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index b984e73..6e0373b 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -17,6 +17,7 @@ #include "base/logging.h" #include "base/logging_win.h" #include "base/path_service.h" +#include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" @@ -253,14 +254,13 @@ HRESULT RefreshElevationPolicy() { HRESULT SetupRunOnce() { HRESULT result = E_FAIL; - std::wstring channel_name; + string16 channel_name; if (base::win::GetVersion() < base::win::VERSION_VISTA && GoogleUpdateSettings::GetChromeChannelAndModifiers(true, &channel_name)) { std::transform(channel_name.begin(), channel_name.end(), channel_name.begin(), tolower); - // Use this only for the dev channel and CEEE channels. - if (channel_name.find(L"dev") != std::wstring::npos || - channel_name.find(L"ceee") != std::wstring::npos) { + // Use this only for the dev channel. + if (channel_name.find(L"dev") != string16::npos) { HKEY hive = HKEY_CURRENT_USER; if (IsSystemProcess()) { // For system installs, our updates will be running as SYSTEM which diff --git a/chrome_frame/delete_chrome_history.cc b/chrome_frame/delete_chrome_history.cc index c83944c..03313d1 100644 --- a/chrome_frame/delete_chrome_history.cc +++ b/chrome_frame/delete_chrome_history.cc @@ -74,7 +74,7 @@ STDMETHODIMP DeleteChromeHistory::DeleteBrowsingHistory(DWORD flags) { if (integrity_level == base::LOW_INTEGRITY) { return S_OK; } - if (!InitializeAutomation(GetHostProcessName(false), L"", false, false, + if (!InitializeAutomation(GetHostProcessName(false), false, false, GURL(), GURL(), true)) { return E_UNEXPECTED; } diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc index 68deba6..70db638 100644 --- a/chrome_frame/test/automation_client_mock.cc +++ b/chrome_frame/test/automation_client_mock.cc @@ -106,7 +106,7 @@ TEST(CFACWithChrome, CreateTooFast) { GURL empty; scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams( - empty, empty, profile_path, profile_path.BaseName().value(), L"", L"", + empty, empty, profile_path, profile_path.BaseName().value(), L"", false, false, false)); clp->set_launch_timeout(timeout); clp->set_version_check(false); @@ -138,7 +138,7 @@ TEST(CFACWithChrome, CreateNotSoFast) { GURL empty; scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams( - empty, empty, profile_path, profile_path.BaseName().value(), L"", L"", + empty, empty, profile_path, profile_path.BaseName().value(), L"", false, false, false)); clp->set_launch_timeout(timeout); clp->set_version_check(false); @@ -187,7 +187,7 @@ TEST(CFACWithChrome, NavigateOk) { GURL empty; scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams( - empty, empty, profile_path, profile_path.BaseName().value(), L"", L"", + empty, empty, profile_path, profile_path.BaseName().value(), L"", false, false, false)); clp->set_launch_timeout(timeout); clp->set_version_check(false); @@ -234,7 +234,7 @@ TEST(CFACWithChrome, NavigateFailed) { GURL empty; scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams( - empty, empty, profile_path, profile_path.BaseName().value(), L"", L"", + empty, empty, profile_path, profile_path.BaseName().value(), L"", false, false, false)); clp->set_launch_timeout(10000); clp->set_version_check(false); @@ -272,7 +272,7 @@ TEST_F(CFACMockTest, MockedCreateTabOk) { // Here we go! GURL empty; scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams( - empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"", + empty, empty, profile_path_, profile_path_.BaseName().value(), L"", false, false, false)); clp->set_launch_timeout(timeout); clp->set_version_check(false); @@ -305,7 +305,7 @@ TEST_F(CFACMockTest, MockedCreateTabFailed) { // Here we go! GURL empty; scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams( - empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"", + empty, empty, profile_path_, profile_path_.BaseName().value(), L"", false, false, false)); clp->set_launch_timeout(timeout_); clp->set_version_check(false); @@ -346,7 +346,7 @@ TEST_F(CFACMockTest, OnChannelError) { GURL empty; scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams( - empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"", + empty, empty, profile_path_, profile_path_.BaseName().value(), L"", false, false, false)); clp->set_launch_timeout(1); // Unneeded timeout, but can't be 0. clp->set_version_check(false); @@ -467,7 +467,7 @@ TEST_F(CFACMockTest, NavigateTwiceAfterInitToSameUrl) { scoped_refptr<ChromeFrameLaunchParams> launch_params( new ChromeFrameLaunchParams( GURL("http://www.nonexistent.com"), empty, profile_path_, - profile_path_.BaseName().value(), L"", L"", false, false, false)); + profile_path_.BaseName().value(), L"", false, false, false)); launch_params->set_launch_timeout(timeout); launch_params->set_version_check(false); EXPECT_TRUE(client_->Initialize(&cfd_, launch_params)); diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h index ce3c351..5a61e39 100644 --- a/chrome_frame/test/chrome_frame_automation_mock.h +++ b/chrome_frame/test/chrome_frame_automation_mock.h @@ -27,8 +27,7 @@ class AutomationMockDelegate int launch_timeout, bool perform_version_check, const std::wstring& profile_name, const std::wstring& language, - const std::wstring& extra_chrome_arguments, bool incognito, - bool is_widget_mode) + bool incognito, bool is_widget_mode) : caller_message_loop_(caller_message_loop), is_connected_(false), navigation_result_(false), mock_server_(1337, L"127.0.0.1", @@ -48,8 +47,7 @@ class AutomationMockDelegate GURL empty; scoped_refptr<ChromeFrameLaunchParams> clp( new ChromeFrameLaunchParams(empty, empty, profile_path, profile_name, - language, extra_chrome_arguments, incognito, is_widget_mode, - false)); + language, incognito, is_widget_mode, false)); clp->set_launch_timeout(launch_timeout); clp->set_version_check(perform_version_check); automation_client_->Initialize(this, clp); @@ -154,7 +152,7 @@ class AutomationMockLaunch typedef AutomationMockDelegate<AutomationMockLaunch> Base; AutomationMockLaunch(MessageLoop* caller_message_loop, int launch_timeout) - : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false, + : Base(caller_message_loop, launch_timeout, true, L"", L"", false, false) { } virtual void OnAutomationServerReady() { @@ -172,7 +170,7 @@ class AutomationMockNavigate typedef AutomationMockDelegate<AutomationMockNavigate> Base; AutomationMockNavigate(MessageLoop* caller_message_loop, int launch_timeout) - : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false, + : Base(caller_message_loop, launch_timeout, true, L"", L"", false, false) { } virtual void OnLoad(const GURL& url) { @@ -187,7 +185,7 @@ class AutomationMockPostMessage typedef AutomationMockDelegate<AutomationMockPostMessage> Base; AutomationMockPostMessage(MessageLoop* caller_message_loop, int launch_timeout) - : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false, + : Base(caller_message_loop, launch_timeout, true, L"", L"", false, false), postmessage_result_(false) {} bool postmessage_result() const { @@ -215,7 +213,7 @@ class AutomationMockHostNetworkRequestStart typedef AutomationMockDelegate<AutomationMockHostNetworkRequestStart> Base; AutomationMockHostNetworkRequestStart(MessageLoop* caller_message_loop, int launch_timeout) - : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false, + : Base(caller_message_loop, launch_timeout, true, L"", L"", false, false), request_start_result_(false) { if (automation()) { diff --git a/chrome_frame/test/proxy_factory_mock.cc b/chrome_frame/test/proxy_factory_mock.cc index 5b6ecbc..62bd3da 100644 --- a/chrome_frame/test/proxy_factory_mock.cc +++ b/chrome_frame/test/proxy_factory_mock.cc @@ -23,7 +23,7 @@ TEST(ProxyFactoryTest, CreateDestroy) { FilePath profile_path; scoped_refptr<ChromeFrameLaunchParams> params( new ChromeFrameLaunchParams(empty, empty, profile_path, - L"Adam.N.Epilinter", L"", L"", false, false, false)); + L"Adam.N.Epilinter", L"", false, false, false)); params->set_launch_timeout(0); params->set_version_check(false); @@ -44,7 +44,7 @@ TEST(ProxyFactoryTest, CreateSameProfile) { FilePath profile_path; scoped_refptr<ChromeFrameLaunchParams> params( new ChromeFrameLaunchParams(empty, empty, profile_path, - L"Dr. Gratiano Forbeson", L"", L"", false, false, false)); + L"Dr. Gratiano Forbeson", L"", false, false, false)); params->set_launch_timeout(0); params->set_version_check(false); @@ -69,13 +69,13 @@ TEST(ProxyFactoryTest, CreateDifferentProfiles) { FilePath profile_path; scoped_refptr<ChromeFrameLaunchParams> params1( new ChromeFrameLaunchParams(empty, empty, profile_path, - L"Adam.N.Epilinter", L"", L"", false, false, false)); + L"Adam.N.Epilinter", L"", false, false, false)); params1->set_launch_timeout(0); params1->set_version_check(false); scoped_refptr<ChromeFrameLaunchParams> params2( new ChromeFrameLaunchParams(empty, empty, profile_path, - L"Dr. Gratiano Forbeson", L"", L"", false, false, false)); + L"Dr. Gratiano Forbeson", L"", false, false, false)); params2->set_launch_timeout(0); params2->set_version_check(false); @@ -102,7 +102,7 @@ TEST(ProxyFactoryTest, DISABLED_FastCreateDestroy) { FilePath profile_path; scoped_refptr<ChromeFrameLaunchParams> params( new ChromeFrameLaunchParams(empty, empty, profile_path, - L"Dr. Gratiano Forbeson", L"", L"", false, false, false)); + L"Dr. Gratiano Forbeson", L"", false, false, false)); params->set_launch_timeout(10000); params->set_version_check(false); |