diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-15 16:16:11 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-15 16:16:11 +0000 |
| commit | a2deace9e0e42b283e7f5c38754aa1647308ca6c (patch) | |
| tree | 30f6d94bdc79a9db4ac7ce7cacdac1a6106b374f /webkit | |
| parent | 3e3986e24a847ac5341708827b33b5e76a83037a (diff) | |
| download | chromium_src-a2deace9e0e42b283e7f5c38754aa1647308ca6c.zip chromium_src-a2deace9e0e42b283e7f5c38754aa1647308ca6c.tar.gz chromium_src-a2deace9e0e42b283e7f5c38754aa1647308ca6c.tar.bz2 | |
Turn off ActiveX for non-Windows platforms
Review URL: http://codereview.chromium.org/2814
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 8 | ||||
| -rw-r--r-- | webkit/glue/webview_delegate.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index e169bc4..6d0b333 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -28,12 +28,15 @@ #pragma warning(pop) #undef LOG +#include "base/basictypes.h" #include "base/command_line.h" #include "base/logging.h" #include "base/string_util.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" +#if defined(OS_WIN) #include "webkit/activex_shim/activex_shared.h" +#endif #include "webkit/glue/webframeloaderclient_impl.h" #include "webkit/glue/alt_404_page_resource_fetcher.h" #include "webkit/glue/glue_util.h" @@ -1337,7 +1340,9 @@ Widget* WebFrameLoaderClient::createPlugin(const IntSize& size, // TODO(erikkay) StringToLowerASCII(&my_mime_type); // Get the classid and version from attributes of the object. - std::string clsid, version, combined_clsid; + std::string combined_clsid; +#if defined(OS_WIN) + std::string clsid, version; if (activex_shim::IsMimeTypeActiveX(my_mime_type)) { GURL url = webframe_->GetURL(); for (unsigned int i = 0; i < param_names.size(); i++) { @@ -1361,6 +1366,7 @@ Widget* WebFrameLoaderClient::createPlugin(const IntSize& size, // TODO(erikkay) else combined_clsid = clsid; } +#endif std::string actual_mime_type; WebPluginDelegate* plugin_delegate = diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index 6a3f9df..0b4b4fb 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -114,6 +114,8 @@ class WebViewDelegate : virtual public WebWidgetDelegate { // This method is called to create a WebPluginDelegate implementation when a // new plugin is instanced. See webkit_glue::CreateWebPluginDelegateHelper // for a default WebPluginDelegate implementation. + // TODO(port): clsid is very Win- and ActiveX-specific; refactor to be more + // platform-neutral virtual WebPluginDelegate* CreatePluginDelegate( WebView* webview, const GURL& url, |