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

Unified Diff: chrome/installer/util/shell_util.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: hi gab 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/util/shell_util.cc
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 3115aeb0db9b4d983281cb41b9cdaba84114ae0c..374d7134111cb5ee0064ffd934f3f0eef841c1f3 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -89,9 +89,11 @@ class RegistryEntry {
// handler will be in HKCU; thus we do not need a suffix on those entries.
string16 app_id(dist->GetBrowserAppId());
string16 delegate_guid;
+ // TODO(grt): remove HasDelegateExecuteHandler when the exe is ever-present;
+ // cf. install_worker.cc's AddDelegateExecuteWorkItems.
gab 2012/04/25 13:44:03 Same comment about "cf."
grt (UTC plus 2) 2012/04/25 14:33:49 Done.
bool set_delegate_execute =
- base::win::GetVersion() >= base::win::VERSION_WIN8 &&
- dist->GetDelegateExecuteHandlerData(&delegate_guid, NULL, NULL, NULL);
+ dist->GetDelegateExecuteHandlerData(&delegate_guid, NULL, NULL, NULL) &&
+ InstallUtil::HasDelegateExecuteHandler(dist, chrome_exe);
// DelegateExecute ProgId. Needed for Chrome Metro in Windows 8.
if (set_delegate_execute) {
« chrome/installer/setup/install_worker.cc ('K') | « chrome/installer/util/install_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698