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

Unified Diff: webkit/api/src/FrameLoaderClientImpl.cpp

Issue 351001: Revert "Eliminate mime_util dependency from WebFrameLoaderClient." (Closed)
Patch Set: Created 11 years, 2 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 | « webkit/api/public/WebMimeRegistry.h ('k') | webkit/glue/simple_webmimeregistry_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/api/src/FrameLoaderClientImpl.cpp
diff --git a/webkit/api/src/FrameLoaderClientImpl.cpp b/webkit/api/src/FrameLoaderClientImpl.cpp
index e2707749daa54a6f57af511fa172ad5a36b3abe1..b7b310e452fdf9f63113049569938c0e41e8a583 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.
« no previous file with comments | « webkit/api/public/WebMimeRegistry.h ('k') | webkit/glue/simple_webmimeregistry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698