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

Unified Diff: WebCore/loader/SubframeLoader.h

Issue 3551010: Merge 66992 - 2010-09-08 Andy Estes <aestes@apple.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « WebCore/html/HTMLObjectElement.cpp ('k') | WebCore/loader/SubframeLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/loader/SubframeLoader.h
===================================================================
--- WebCore/loader/SubframeLoader.h (revision 68934)
+++ WebCore/loader/SubframeLoader.h (working copy)
@@ -75,6 +75,8 @@
bool allowPlugins(ReasonForCallingAllowPlugins);
bool containsPlugins() const { return m_containsPlugins; }
+
+ bool resourceWillUsePlugin(const String&, const String&);
private:
Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const AtomicString& frameName, bool lockHistory, bool lockBackForwardList);
« no previous file with comments | « WebCore/html/HTMLObjectElement.cpp ('k') | WebCore/loader/SubframeLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698