summaryrefslogtreecommitdiffstats
path: root/chrome/browser/custom_handlers
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/custom_handlers')
-rw-r--r--chrome/browser/custom_handlers/protocol_handler_registry.cc3
-rw-r--r--chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc
index 0300e6d..5a6dfae 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc
@@ -39,7 +39,8 @@ bool ShouldRemoveHandlersNotInOS() {
// difference (http://crbug.com/88255).
return false;
#else
- return ShellIntegration::CanSetAsDefaultProtocolClient();
+ return ShellIntegration::CanSetAsDefaultProtocolClient() !=
+ ShellIntegration::SET_DEFAULT_NOT_ALLOWED;
#endif
}
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index 83161e6..570b21d 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -126,7 +126,7 @@ class FakeProtocolClientWorker
}
}
- virtual void SetAsDefault() {}
+ virtual void SetAsDefault(bool interactive_permitted) {}
private:
bool force_failure_;