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

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: Rebase? Created 5 years 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 allowPlugins(bool enabledPerSettings) override; 138 bool allowPlugins(bool enabledPerSettings) override;
139 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override; 139 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override;
140 bool allowMedia(const KURL& mediaURL) override; 140 bool allowMedia(const KURL& mediaURL) override;
141 bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin* , const KURL&) override; 141 bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin* , const KURL&) override;
142 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override; 142 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override;
143 void didNotAllowScript() override; 143 void didNotAllowScript() override;
144 void didNotAllowPlugins() override; 144 void didNotAllowPlugins() override;
145 void usedKeygen() override;
jochen (gone - plz use gerrit) 2015/11/24 13:05:08 didUseKeygen
svaldez 2015/11/24 17:29:04 Done.
145 146
146 WebCookieJar* cookieJar() const override; 147 WebCookieJar* cookieJar() const override;
147 bool willCheckAndDispatchMessageEvent(SecurityOrigin* target, MessageEvent*, LocalFrame* sourceFrame) const override; 148 bool willCheckAndDispatchMessageEvent(SecurityOrigin* target, MessageEvent*, LocalFrame* sourceFrame) const override;
148 void didChangeName(const String&) override; 149 void didChangeName(const String&) override;
149 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override; 150 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;
150 void didChangeFrameOwnerProperties(HTMLFrameElementBase*) override; 151 void didChangeFrameOwnerProperties(HTMLFrameElementBase*) override;
151 152
152 void dispatchWillOpenWebSocket(WebSocketHandle*) override; 153 void dispatchWillOpenWebSocket(WebSocketHandle*) override;
153 154
154 void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler *) override; 155 void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler *) override;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 // The WebFrame that owns this object and manages its lifetime. Therefore, 188 // The WebFrame that owns this object and manages its lifetime. Therefore,
188 // the web frame object is guaranteed to exist. 189 // the web frame object is guaranteed to exist.
189 RawPtrWillBeMember<WebLocalFrameImpl> m_webFrame; 190 RawPtrWillBeMember<WebLocalFrameImpl> m_webFrame;
190 }; 191 };
191 192
192 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl()); 193 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());
193 194
194 } // namespace blink 195 } // namespace blink
195 196
196 #endif 197 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698