third_party/WebKit/Source/web/FrameLoaderClientImpl.h - Issue 1550233002: Move mixed content settings histograms into browser

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

Issue 1550233002: Move mixed content settings histograms into browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: typo fix Created 4 years, 11 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

« 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 129 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
140 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override;	140 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override;

141 bool allowMedia(const KURL& mediaURL) override;	141 bool allowMedia(const KURL& mediaURL) override;

142 bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin* , const KURL&) override;	142 bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin* , const KURL&) override;

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

144 void didNotAllowScript() override;	144 void didNotAllowScript() override;

145 void didNotAllowPlugins() override;	145 void didNotAllowPlugins() override;

146	146

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

148 bool willCheckAndDispatchMessageEvent(SecurityOrigin* target, MessageEvent, LocalFrame sourceFrame) const override;	148 bool willCheckAndDispatchMessageEvent(SecurityOrigin* target, MessageEvent, LocalFrame sourceFrame) const override;

149 void frameFocused() const override;	149 void frameFocused() const override;

	150 void triedDisplayingInsecureContent(SecurityOrigin*, const KURL&) const over ride;

	151 void triedRunningInsecureContent(SecurityOrigin*, const KURL&) const overrid e;

150 void didChangeName(const String&) override;	152 void didChangeName(const String&) override;

151 void didEnforceStrictMixedContentChecking() override;	153 void didEnforceStrictMixedContentChecking() override;

152 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;	154 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;

153 void didChangeFrameOwnerProperties(HTMLFrameElementBase*) override;	155 void didChangeFrameOwnerProperties(HTMLFrameElementBase*) override;

154	156

155 void dispatchWillOpenWebSocket(WebSocketHandle*) override;	157 void dispatchWillOpenWebSocket(WebSocketHandle*) override;

156	158

157 void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler *) override;	159 void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler *) override;

158	160

159 void didRequestAutocomplete(HTMLFormElement*) override;	161 void didRequestAutocomplete(HTMLFormElement*) override;

(...skipping 26 matching lines...) Expand all Loading...
186 // The WebFrame that owns this object and manages its lifetime. Therefore,	188 // The WebFrame that owns this object and manages its lifetime. Therefore,

187 // the web frame object is guaranteed to exist.	189 // the web frame object is guaranteed to exist.

188 RawPtrWillBeMember<WebLocalFrameImpl> m_webFrame;	190 RawPtrWillBeMember<WebLocalFrameImpl> m_webFrame;

189 };	191 };

190	192

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

192	194

193 } // namespace blink	195 } // namespace blink

194	196

195 #endif	197 #endif

OLD	NEW