chrome/browser/custom_handlers/protocol_handler_registry.cc - Issue 7388009: Canary versions no longer always remove protocol handlers at startup.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/custom_handlers/protocol_handler_registry.cc

Issue 7388009: Canary versions no longer always remove protocol handlers at startup. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fixed up comment. Created 9 years, 5 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/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 d7a10b86bd888cf4f5c339c6e817eddc6b72d883..cccc2dc4f2568e29ad1edc5cb6d6870cdbfd1d46 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

}

« no previous file with comments | « no previous file | chrome/browser/shell_integration.h » ('j') | no next file with comments »