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

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

Issue 10213010: Don't register or use the DelegateExecute verb handler if it isn't present. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added code to not set the handler on shell verb registration Created 8 years, 8 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
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index ba2abb5a98341b0d5863137f0f103f0a81af6324..8dc12c6d8db77cf2d7e0c499ca19567d2423e69a 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -701,13 +701,12 @@ const wchar_t kChromeExtProgId[] = L"ChromiumExt";
// work items for |product|. This will be a noop for products whose
// corresponding BrowserDistribution implementations do not publish
// DelegateExecute data via an implementation of GetDelegateExecuteHandlerData.
-bool ProcessDelegateExecuteWorkItems(const InstallationState& original_state,
- const InstallerState& installer_state,
+bool ProcessDelegateExecuteWorkItems(const InstallerState& installer_state,
const FilePath& setup_path,
gab 2012/04/25 05:18:29 |setup_path| is now unused.
grt (UTC plus 2) 2012/04/25 13:05:11 Good catch. Done.
const Product& product) {
scoped_ptr<WorkItemList> item_list(WorkItem::CreateNoRollbackWorkItemList());
- AddDelegateExecuteWorkItems(original_state, installer_state, setup_path,
- Version(), product, item_list.get());
+ AddDelegateExecuteWorkItems(installer_state, FilePath(), Version(), product,
gab 2012/04/25 05:18:29 I don't like having to create empty FilePath and V
grt (UTC plus 2) 2012/04/25 13:05:11 For the most part, pointers are used for out/inout
+ item_list.get());
return item_list->Do();
}
@@ -830,8 +829,7 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
suffix, installer_state.target_path(), &ret);
}
- ProcessDelegateExecuteWorkItems(original_state, installer_state, setup_path,
- product);
+ ProcessDelegateExecuteWorkItems(installer_state, setup_path, product);
if (!is_chrome) {
ProcessChromeFrameWorkItems(original_state, installer_state, setup_path,

Powered by Google App Engine
This is Rietveld 408576698