Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(990)

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

Issue 1417033010: Adding <keygen> Content Setting (Blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_core
Patch Set: Clean up code. Created 5 years, 1 month 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
OLDNEW
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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 const WTF::String&, bool loadManually, DetachedPluginPolicy) override; 128 const WTF::String&, bool loadManually, DetachedPluginPolicy) override;
129 PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const Web URL&, WebMediaPlayerClient*) override; 129 PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const Web URL&, WebMediaPlayerClient*) override;
130 PassOwnPtr<WebMediaSession> createWebMediaSession() override; 130 PassOwnPtr<WebMediaSession> createWebMediaSession() override;
131 ObjectContentType objectContentType( 131 ObjectContentType objectContentType(
132 const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForIma ges) override; 132 const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForIma ges) override;
133 void didChangeScrollOffset() override; 133 void didChangeScrollOffset() override;
134 void didUpdateCurrentHistoryItem() override; 134 void didUpdateCurrentHistoryItem() override;
135 void didRemoveAllPendingStylesheet() override; 135 void didRemoveAllPendingStylesheet() override;
136 bool allowScript(bool enabledPerSettings) override; 136 bool allowScript(bool enabledPerSettings) override;
137 bool allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL) o verride; 137 bool allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL) o verride;
138 bool allowKeygen() override;
138 bool allowPlugins(bool enabledPerSettings) override; 139 bool allowPlugins(bool enabledPerSettings) override;
139 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override; 140 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override;
140 bool allowMedia(const KURL& mediaURL) override; 141 bool allowMedia(const KURL& mediaURL) override;
141 bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin* , const KURL&) override; 142 bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin* , const KURL&) override;
142 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override; 143 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override;
143 void didNotAllowScript() override; 144 void didNotAllowScript() override;
145 void didNotAllowKeygen() override;
144 void didNotAllowPlugins() override; 146 void didNotAllowPlugins() override;
145 147
146 WebCookieJar* cookieJar() const override; 148 WebCookieJar* cookieJar() const override;
147 bool willCheckAndDispatchMessageEvent(SecurityOrigin* target, MessageEvent*, LocalFrame* sourceFrame) const override; 149 bool willCheckAndDispatchMessageEvent(SecurityOrigin* target, MessageEvent*, LocalFrame* sourceFrame) const override;
148 void didChangeName(const String&) override; 150 void didChangeName(const String&) override;
149 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override; 151 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;
150 152
151 void dispatchWillOpenWebSocket(WebSocketHandle*) override; 153 void dispatchWillOpenWebSocket(WebSocketHandle*) override;
152 154
153 void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler *) override; 155 void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler *) override;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698