diff options
| author | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-01 02:56:44 +0000 |
|---|---|---|
| committer | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-01 02:56:44 +0000 |
| commit | 3bc67d82dd6310c46b0c1e9c4d9c2af50481f4e7 (patch) | |
| tree | 9ec0689f7c804d2ed9725e9145b45a9f5ae70d79 /webkit/api | |
| parent | 874fe541ce554db2f5ebc0a2b857cd3d97945739 (diff) | |
| download | chromium_src-3bc67d82dd6310c46b0c1e9c4d9c2af50481f4e7.zip chromium_src-3bc67d82dd6310c46b0c1e9c4d9c2af50481f4e7.tar.gz chromium_src-3bc67d82dd6310c46b0c1e9c4d9c2af50481f4e7.tar.bz2 | |
Revert "Eliminate mime_util dependency from WebFrameLoaderClient."
This reverts commit f6429666a47eac17a18409d1743841bc44ed9a7a.
Review URL: http://codereview.chromium.org/351001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api')
| -rw-r--r-- | webkit/api/public/WebMimeRegistry.h | 1 | ||||
| -rw-r--r-- | webkit/api/src/FrameLoaderClientImpl.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/webkit/api/public/WebMimeRegistry.h b/webkit/api/public/WebMimeRegistry.h index afdf736..e85b9cd 100644 --- a/webkit/api/public/WebMimeRegistry.h +++ b/webkit/api/public/WebMimeRegistry.h @@ -40,7 +40,6 @@ namespace WebKit { public: enum SupportsType { IsNotSupported, IsSupported, MayBeSupported }; - virtual SupportsType supportsMIMEType(const WebString& mimeType) = 0; virtual SupportsType supportsImageMIMEType(const WebString& mimeType) = 0; virtual SupportsType supportsJavaScriptMIMEType(const WebString& mimeType) = 0; virtual SupportsType supportsMediaMIMEType(const WebString& mimeType, diff --git a/webkit/api/src/FrameLoaderClientImpl.cpp b/webkit/api/src/FrameLoaderClientImpl.cpp index e270774..b7b310e 100644 --- a/webkit/api/src/FrameLoaderClientImpl.cpp +++ b/webkit/api/src/FrameLoaderClientImpl.cpp @@ -53,7 +53,6 @@ #include "WebFrameImpl.h" #include "WebKit.h" #include "WebKitClient.h" -#include "WebMimeRegistry.h" #include "WebNode.h" #include "WebPlugin.h" #include "WebPluginParams.h" @@ -71,6 +70,7 @@ #include "WrappedResourceResponse.h" // FIXME: remove these +#include "net/base/mime_util.h" #include "webkit/glue/webdevtoolsagent_impl.h" using namespace WebCore; @@ -1118,7 +1118,7 @@ bool FrameLoaderClientImpl::canShowMIMEType(const String& mimeType) const // mimeType strings are supposed to be ASCII, but if they are not for some // reason, then it just means that the mime type will fail all of these "is // supported" checks and go down the path of an unhandled mime type. - if (WebKit::webKitClient()->mimeRegistry()->supportsMIMEType(mimeType) == WebMimeRegistry::IsSupported) + if (net::IsSupportedMimeType(mimeType.latin1().data())) return true; // If Chrome is started with the --disable-plugins switch, pluginData is null. |