summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/browser_distribution.cc22
-rw-r--r--chrome/installer/util/browser_distribution.h3
-rw-r--r--chrome/installer/util/google_chrome_distribution.cc22
-rw-r--r--chrome/installer/util/shell_util.cc1
4 files changed, 19 insertions, 29 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index f34df7c..6ca1b42 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -244,19 +244,15 @@ bool BrowserDistribution::GetDelegateExecuteHandlerData(
string16* type_lib_uuid,
string16* type_lib_version,
string16* interface_uuid) {
- // 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;
+ 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;
}
void BrowserDistribution::UpdateInstallStatus(bool system_install,
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index 894fc465..8944db9 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -122,9 +122,6 @@ class BrowserDistribution {
// |type_lib_uuid| and |type_lib_version| identify its type library.
// |interface_uuid| is the ICommandExecuteImpl interface UUID.
// Only non-null parameters will be set, others will be ignored.
- // Implementations that only provide a DelegateExecute handler for use on
- // certain OS versions must only return true when run on those supported
- // systems.
virtual bool GetDelegateExecuteHandlerData(string16* handler_class_uuid,
string16* type_lib_uuid,
string16* type_lib_version,
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index b11942b..84aa4be 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -546,19 +546,15 @@ bool GoogleChromeDistribution::GetDelegateExecuteHandlerData(
string16* type_lib_uuid,
string16* type_lib_version,
string16* interface_uuid) {
- // 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;
+ 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;
}
// This method checks if we need to change "ap" key in Google Update to try
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 45eaf52..7753fc6 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -92,6 +92,7 @@ class RegistryEntry {
// TODO(grt): remove HasDelegateExecuteHandler when the exe is ever-present;
// see also install_worker.cc's AddDelegateExecuteWorkItems.
bool set_delegate_execute =
+ base::win::GetVersion() >= base::win::VERSION_WIN8 &&
dist->GetDelegateExecuteHandlerData(&delegate_guid, NULL, NULL, NULL) &&
InstallUtil::HasDelegateExecuteHandler(dist, chrome_exe);