third_party/WebKit/Source/web/FrameLoaderClientImpl.h - Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink.

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.h

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)

Patch Set: Cleanup before adding reviewers. Created 4 years, 3 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:

« third_party/WebKit/Source/core/loader/MixedContentChecker.cpp ('K') | « third_party/WebKit/Source/core/loader/MixedContentChecker.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

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

3 * Copyright (C) 2011 Apple Inc. All rights reserved.	3 * Copyright (C) 2011 Apple Inc. All rights reserved.

4 *	4 *

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

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

7 * met:	7 * met:

8 *	8 *

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

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

(...skipping 123 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
134 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, cons t WebMediaPlayerSource&, WebMediaPlayerClient*) override;	134 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, cons t WebMediaPlayerSource&, WebMediaPlayerClient*) override;

135 std::unique_ptr<WebMediaSession> createWebMediaSession() override;	135 std::unique_ptr<WebMediaSession> createWebMediaSession() override;

136 ObjectContentType getObjectContentType(	136 ObjectContentType getObjectContentType(

137 const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForIma ges) override;	137 const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForIma ges) override;

138 void didChangeScrollOffset() override;	138 void didChangeScrollOffset() override;

139 void didUpdateCurrentHistoryItem() override;	139 void didUpdateCurrentHistoryItem() override;

140 bool allowScript(bool enabledPerSettings) override;	140 bool allowScript(bool enabledPerSettings) override;

141 bool allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL) o verride;	141 bool allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL) o verride;

142 bool allowPlugins(bool enabledPerSettings) override;	142 bool allowPlugins(bool enabledPerSettings) override;

143 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override;	143 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override;

144 bool allowDisplayingInsecureContent(bool enabledPerSettings, const KURL&) ov erride;

145 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override;	144 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override;

146 bool allowAutoplay(bool defaultValue) override;	145 bool allowAutoplay(bool defaultValue) override;

	146 void passiveInsecureContentFound(const KURL&) override;

147 void didNotAllowScript() override;	147 void didNotAllowScript() override;

148 void didNotAllowPlugins() override;	148 void didNotAllowPlugins() override;

149 void didUseKeygen() override;	149 void didUseKeygen() override;

150	150

151 WebCookieJar* cookieJar() const override;	151 WebCookieJar* cookieJar() const override;

152 void frameFocused() const override;	152 void frameFocused() const override;

153 void didChangeName(const String& name, const String& uniqueName) override;	153 void didChangeName(const String& name, const String& uniqueName) override;

154 void didEnforceInsecureRequestPolicy(WebInsecureRequestPolicy) override;	154 void didEnforceInsecureRequestPolicy(WebInsecureRequestPolicy) override;

155 void didUpdateToUniqueOrigin() override;	155 void didUpdateToUniqueOrigin() override;

156 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;	156 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
197 Member<WebLocalFrameImpl> m_webFrame;	197 Member<WebLocalFrameImpl> m_webFrame;

198	198

199 String m_userAgent;	199 String m_userAgent;

200 };	200 };

201	201

202 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());	202 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());

203	203

204 } // namespace blink	204 } // namespace blink

205	205

206 #endif	206 #endif

OLD	NEW