Source/core/loader/MixedContentChecker.h - Issue 1265953002: Appease jschuh@ by adding a setting to move 'plugin' to blockable mixed content.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/core/loader/MixedContentChecker.h

Issue 1265953002: Appease jschuh@ by adding a setting to move 'plugin' to blockable mixed content. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 4 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 unified diff | Download patch

« no previous file with comments | « Source/core/frame/Settings.in ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 };	71 };

72	72

73 enum ContextType {	73 enum ContextType {

74 ContextTypeBlockable,	74 ContextTypeBlockable,

75 ContextTypeOptionallyBlockable,	75 ContextTypeOptionallyBlockable,

76 ContextTypeShouldBeBlockable,	76 ContextTypeShouldBeBlockable,

77 };	77 };

78	78

79 static LocalFrame* inWhichFrameIsContentMixed(LocalFrame*, WebURLRequest::Fr ameType, const KURL&);	79 static LocalFrame* inWhichFrameIsContentMixed(LocalFrame*, WebURLRequest::Fr ameType, const KURL&);

80	80

81 static ContextType contextTypeFromContext(WebURLRequest::RequestContext);	81 static ContextType contextTypeFromContext(WebURLRequest::RequestContext, Loc alFrame*);

82 static const char* typeNameFromContext(WebURLRequest::RequestContext);	82 static const char* typeNameFromContext(WebURLRequest::RequestContext);

83 static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest:: RequestContext, bool allowed);	83 static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest:: RequestContext, bool allowed);

84 static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowe d);	84 static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowe d);

85 static void count(LocalFrame*, WebURLRequest::RequestContext);	85 static void count(LocalFrame*, WebURLRequest::RequestContext);

86 };	86 };

87	87

88 } // namespace blink	88 } // namespace blink

89	89

90 #endif // MixedContentChecker_h	90 #endif // MixedContentChecker_h

OLD	NEW