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

Unified Diff: chrome/installer/util/google_chrome_distribution.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: logging tweak 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/google_chrome_distribution.cc
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 79b7c9330346c56e74d4bddaec41ad08778c3102..2c91adfa1671c7c2c452abec15498ca93e14201b 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -538,15 +538,19 @@ bool GoogleChromeDistribution::GetDelegateExecuteHandlerData(
string16* type_lib_uuid,
string16* type_lib_version,
string16* interface_uuid) {
- if (handler_class_uuid)
- *handler_class_uuid = kCommandExecuteImplUuid;
- if (type_lib_uuid)
- *type_lib_uuid = kDelegateExecuteLibUuid;
- if (type_lib_version)
- *type_lib_version = kDelegateExecuteLibVersion;
- if (interface_uuid)
- *interface_uuid = kICommandExecuteImplUuid;
- return true;
+ // Chrome's DelegateExecute verb handler is only used for Windows 8 and up.
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+ if (handler_class_uuid)
+ *handler_class_uuid = kCommandExecuteImplUuid;
+ if (type_lib_uuid)
+ *type_lib_uuid = kDelegateExecuteLibUuid;
+ if (type_lib_version)
+ *type_lib_version = kDelegateExecuteLibVersion;
+ if (interface_uuid)
+ *interface_uuid = kICommandExecuteImplUuid;
+ return true;
+ }
+ return false;
}
// This method checks if we need to change "ap" key in Google Update to try

Powered by Google App Engine
This is Rietveld 408576698