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

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

Issue 6588003: Add support for the quick-enable-cf command to the installer. This encompase... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 months 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
« no previous file with comments | « chrome/chrome_installer_util.gypi ('k') | chrome/installer/setup/install_worker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/chrome_frame_quick_enable.cc
===================================================================
--- chrome/installer/setup/chrome_frame_quick_enable.cc (revision 76747)
+++ chrome/installer/setup/chrome_frame_quick_enable.cc (working copy)
@@ -42,7 +42,7 @@
return NON_MULTI_INSTALLATION_EXISTS;
}
- // Chrome Frame must not be installed.
+ // Chrome Frame must not be installed (ready-mode doesn't count).
const ProductState* cf_state =
machine_state.GetProductState(installer_state.system_install(),
BrowserDistribution::CHROME_FRAME);
@@ -52,7 +52,9 @@
BrowserDistribution::CHROME_FRAME);
}
- if (cf_state != NULL) {
+ if (cf_state != NULL &&
+ !cf_state->uninstall_command().HasSwitch(
+ switches::kChromeFrameReadyMode)) {
LOG(ERROR) << "Chrome Frame already installed.";
return installer_state.system_install() ?
SYSTEM_LEVEL_INSTALL_EXISTS : USER_LEVEL_INSTALL_EXISTS;
@@ -120,6 +122,12 @@
*chrome_state);
AddGoogleUpdateWorkItems(*installer_state, item_list.get());
+ // Add the items to remove the quick-enable-cf command from the registry.
+ AddQuickEnableWorkItems(*installer_state, machine_state,
+ &chrome_state->uninstall_command().GetProgram(),
+ &chrome_state->version(),
+ item_list.get());
+
if (!item_list->Do()) {
item_list->Rollback();
status = INSTALL_FAILED;
« no previous file with comments | « chrome/chrome_installer_util.gypi ('k') | chrome/installer/setup/install_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698