Eliminate mime_util dependency from WebFrameLoaderClient

webkit/api/src/FrameLoaderClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
 #include "MouseEvent.h"
 #include "Page.h"
 #include "PlatformString.h"
 #include "PluginData.h"
 #include "StringExtras.h"
 #include "WebForm.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
 #include "WebKit.h"
 #include "WebKitClient.h"
+#include "WebMimeRegistry.h"
 #include "WebNode.h"
 #include "WebPlugin.h"
 #include "WebPluginParams.h"
 #include "WebSecurityOrigin.h"
 #include "WebURL.h"
 #include "WebURLError.h"
 #include "WebVector.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "WebDataSourceImpl.h"
 #include "WebPluginContainerImpl.h"
 #include "WebPluginLoadObserver.h"
 #include "WindowFeatures.h"
 #include "WrappedResourceRequest.h"
 #include "WrappedResourceResponse.h"
 
 // FIXME: remove these
-#include "net/base/mime_util.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 // Domain for internal error codes.
 static const char internalErrorDomain[] = "WebKit";
 
 // An internal error code.  Used to note a policy change error resulting from
@@ skipping 1027 matching lines @@
 
 bool FrameLoaderClientImpl::canShowMIMEType(const String& mimeType) const
 {
     // This method is called to determine if the media type can be shown
     // "internally" (i.e. inside the browser) regardless of whether or not the
     // browser or a plugin is doing the rendering.
 
     // 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 (net::IsSupportedMimeType(mimeType.latin1().data()))
+    if (WebKit::webKitClient()->mimeRegistry()->supportsMIMEType(mimeType) ==

[darin (slow to review), 2009/10/31 22:35:49]

feel free to not line wrap here since webkit style does not impose a 80 char
line limit.  (webkit developers would normally not line wrap here)

+        WebMimeRegistry::IsSupported)
         return true;
 
     // If Chrome is started with the --disable-plugins switch, pluginData is null.
     PluginData* pluginData = m_webFrame->frame()->page()->pluginData();
 
     // See if the type is handled by an installed plugin, if so, we can show it.
     // FIXME: (http://b/1085524) This is the place to stick a preference to
     //        disable full page plugins (optionally for certain types!)
     return !mimeType.isEmpty() && pluginData && pluginData->supportsMimeType(mimeType);
 }
@@ skipping 261 matching lines @@
 }
 
 PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver()
 {
     WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader(
         m_webFrame->frame()->loader()->activeDocumentLoader());
     return ds->releasePluginLoadObserver();
 }
 
 } // namespace WebKit