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

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

Issue 10837128: Temporarily ifdef out Active Setup for M22 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 2da25ce2f34204f7ff5a148d49512004bad0f6c0..171de1d2ef3ca3fae72e6aef474dc842efdfb820 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -898,8 +898,12 @@ void AddInstallWorkItems(const InstallationState& original_state,
AddDelegateExecuteWorkItems(installer_state, src_path, new_version,
*product, install_list);
+// TODO(gab): This is only disabled for M22 as the shortcut CL using Active
+// Setup will not make it in M22.
+#if 0
AddActiveSetupWorkItems(installer_state, new_version, *product,
install_list);
+#endif
}
// Add any remaining work items that involve special settings for
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698