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

Unified Diff: chrome/installer/setup/chrome_frame_quick_enable.cc

Issue 110163004: Remove Chrome Frame ready-mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile fixes for mini_installer_test Created 7 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
Index: chrome/installer/setup/chrome_frame_quick_enable.cc
diff --git a/chrome/installer/setup/chrome_frame_quick_enable.cc b/chrome/installer/setup/chrome_frame_quick_enable.cc
index 04c1954c39c2c91b3757b40002287ff3cf1645df..9ae7a317fdc6d4d749c6acc89b811ad39761873e 100644
--- a/chrome/installer/setup/chrome_frame_quick_enable.cc
+++ b/chrome/installer/setup/chrome_frame_quick_enable.cc
@@ -41,7 +41,7 @@ InstallStatus CheckQuickEnablePreconditions(
return NON_MULTI_INSTALLATION_EXISTS;
}
- // Chrome Frame must not be installed (ready-mode doesn't count).
+ // Chrome Frame must not be installed.
const ProductState* cf_state =
machine_state.GetProductState(installer_state.system_install(),
BrowserDistribution::CHROME_FRAME);
@@ -51,9 +51,7 @@ InstallStatus CheckQuickEnablePreconditions(
BrowserDistribution::CHROME_FRAME);
}
- if (cf_state != NULL &&
- !cf_state->uninstall_command().HasSwitch(
- switches::kChromeFrameReadyMode)) {
+ if (cf_state != NULL) {
LOG(ERROR) << "Chrome Frame already installed.";
return installer_state.system_install() ?
SYSTEM_LEVEL_INSTALL_EXISTS : USER_LEVEL_INSTALL_EXISTS;
@@ -108,8 +106,6 @@ InstallStatus ChromeFrameQuickEnable(const InstallationState& machine_state,
// context of an interactive session with a user.
AddVersionKeyWorkItems(installer_state->root_key(), cf->distribution(),
new_version, true, item_list.get());
- AddChromeFrameWorkItems(machine_state, *installer_state, setup_path,
- new_version, *cf, item_list.get());
const Version* opv = chrome_state->old_version();
AppendPostInstallTasks(*installer_state, setup_path, opv,

Powered by Google App Engine
This is Rietveld 408576698