diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-04 02:23:25 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-04 02:23:25 +0000 |
| commit | ca9608b447a4b42d74d1d8343cb98c0f7ff123f4 (patch) | |
| tree | 9a935384cfcbdefd757ca47f0c2c65d6a2328374 /webkit/glue/webframeloaderclient_impl.h | |
| parent | 1df3e154f06c18631f7819d8924da972d643835a (diff) | |
| download | chromium_src-ca9608b447a4b42d74d1d8343cb98c0f7ff123f4.zip chromium_src-ca9608b447a4b42d74d1d8343cb98c0f7ff123f4.tar.gz chromium_src-ca9608b447a4b42d74d1d8343cb98c0f7ff123f4.tar.bz2 | |
WebKit merge 40474:40500 [chromium-side].
Review URL: http://codereview.chromium.org/21029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframeloaderclient_impl.h')
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h index e743951..12e1959 100644 --- a/webkit/glue/webframeloaderclient_impl.h +++ b/webkit/glue/webframeloaderclient_impl.h @@ -168,7 +168,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { bool allowsScrolling, int marginWidth, int marginHeight); virtual WebCore::Widget* createPlugin(const WebCore::IntSize&, - WebCore::Element*, + WebCore::HTMLPlugInElement*, const WebCore::KURL&, const WTF::Vector<WebCore::String>&, const WTF::Vector<WebCore::String>&, @@ -176,10 +176,12 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { bool loadManually); virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget); - virtual WebCore::Widget* createJavaAppletWidget(const WebCore::IntSize&, - WebCore::Element*, const WebCore::KURL& baseURL, - const WTF::Vector<WebCore::String>& paramNames, - const WTF::Vector<WebCore::String>& paramValues); + virtual WebCore::Widget* createJavaAppletWidget( + const WebCore::IntSize&, + WebCore::HTMLAppletElement*, + const WebCore::KURL& baseURL, + const WTF::Vector<WebCore::String>& paramNames, + const WTF::Vector<WebCore::String>& paramValues); virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WebCore::String& mimeType); |