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.cc | |
| 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.cc')
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 3363485..4c1d044 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -13,8 +13,8 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "CString.h" #include "Document.h" #include "DocumentLoader.h" -#include "Element.h" #include "HistoryItem.h" +#include "HTMLAppletElement.h" #include "HTMLFormElement.h" // needed by FormState.h #include "HTMLFormControlElement.h" #include "HTMLInputElement.h" @@ -1340,10 +1340,11 @@ static void DeleteToArray(char** arr) { } Widget* WebFrameLoaderClient::createPlugin(const IntSize& size, // TODO(erikkay): how do we use this? - Element *element, const KURL &url, - const Vector<String> ¶m_names, - const Vector<String> ¶m_values, - const String &mime_type, + HTMLPlugInElement* element, + const KURL&url, + const Vector<String>& param_names, + const Vector<String>& param_values, + const String& mime_type, bool load_manually) { WebViewImpl* webview = webframe_->webview_impl(); WebViewDelegate* d = webview->delegate(); @@ -1449,11 +1450,12 @@ void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget) { Widget* WebFrameLoaderClient::createJavaAppletWidget( const IntSize& size, - Element *element, const KURL &url, - const Vector<String> ¶m_names, - const Vector<String> ¶m_values) { + HTMLAppletElement* element, + const KURL& url, + const Vector<String>& param_names, + const Vector<String>& param_values) { return createPlugin(size, element, url, param_names, param_values, - "application/x-java-applet", false); + "application/x-java-applet", false); } ObjectContentType WebFrameLoaderClient::objectContentType( |