From 5e3e0963e07c653f31fd5b57f5de596f4a0863e7 Mon Sep 17 00:00:00 2001 From: "benwells@chromium.org" Date: Mon, 18 Jul 2011 02:25:31 +0000 Subject: Canary versions no longer always remove protocol handlers at startup. Canary versions no longer check OS registration at startup as they cannot make themselves the default OS handler. BUG=88196 TEST=Manual Review URL: http://codereview.chromium.org/7388009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92825 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/custom_handlers/protocol_handler_registry.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/custom_handlers/protocol_handler_registry.cc') diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index d7a10b8..cccc2dc 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -174,7 +174,8 @@ bool ShouldRemoveHandlersNotInOS() { return false; #else const CommandLine& cmd_line = *CommandLine::ForCurrentProcess(); - return !cmd_line.HasSwitch(switches::kDisableCustomProtocolOSCheck); + return ShellIntegration::CanSetAsDefaultProtocolClient() && + !cmd_line.HasSwitch(switches::kDisableCustomProtocolOSCheck); #endif } -- cgit v1.1