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..3e2e27529ab59288316823e218ccca5a68406402 100644 |
--- a/chrome/installer/util/shell_util.cc |
+++ b/chrome/installer/util/shell_util.cc |
@@ -90,8 +90,8 @@ class RegistryEntry { |
string16 app_id(dist->GetBrowserAppId()); |
string16 delegate_guid; |
bool set_delegate_execute = |
gab
2012/04/25 05:18:29
Do we want to also check && dist->CanSetAsDefault(
grt (UTC plus 2)
2012/04/25 13:05:11
This function is never called when !dist->CanSetAs
gab
2012/04/25 13:44:02
Ah ok right. A DCHECK wouldn't hurt, but to be con
grt (UTC plus 2)
2012/04/25 14:33:49
Groovy.
|
- 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); |
gab
2012/04/25 05:18:29
This is somewhat cleaner than the registry lookup
grt (UTC plus 2)
2012/04/25 13:05:11
I think it's safer for all logic to key off the sa
gab
2012/04/25 13:44:02
But in this case your code checking for A deletes
grt (UTC plus 2)
2012/04/25 14:33:49
Except when it doesn't. Rather than mathematicall
|
// DelegateExecute ProgId. Needed for Chrome Metro in Windows 8. |
if (set_delegate_execute) { |
gab
2012/04/25 13:44:02
FYI, this code still will not remove
\\Software\Cl
grt (UTC plus 2)
2012/04/25 14:33:49
Indeed. I've added this to a more recent patchset
|