summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/plugin_lib.cc2
-rw-r--r--webkit/glue/resource_handle_win.cc2
-rw-r--r--webkit/glue/webframeloaderclient_impl.cc4
3 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/plugins/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc
index bf36152..8f28284 100644
--- a/webkit/glue/plugins/plugin_lib.cc
+++ b/webkit/glue/plugins/plugin_lib.cc
@@ -181,7 +181,7 @@ bool PluginLib::SupportsType(const std::string &mime_type,
for (size_t i = 0; i < web_plugin_info_->mime_types.size(); ++i) {
const WebPluginMimeType& mime_info = web_plugin_info_->mime_types[i];
- if (mime_util::MatchesMimeType(mime_info.mime_type, mime_type)) {
+ if (net::MatchesMimeType(mime_info.mime_type, mime_type)) {
if (!allow_wildcard && (mime_info.mime_type == "*")) {
continue;
}
diff --git a/webkit/glue/resource_handle_win.cc b/webkit/glue/resource_handle_win.cc
index 1646f0a..f309274 100644
--- a/webkit/glue/resource_handle_win.cc
+++ b/webkit/glue/resource_handle_win.cc
@@ -91,7 +91,7 @@ bool GetInfoFromDataUrl(const GURL& url,
std::string* data, URLRequestStatus* status) {
std::string mime_type;
std::string charset;
- if (DataURL::Parse(url, &mime_type, &charset, data)) {
+ if (net::DataURL::Parse(url, &mime_type, &charset, data)) {
info->request_time = Time::Now();
info->response_time = Time::Now();
info->mime_type.swap(mime_type);
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index b1056d8..232230f 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1169,8 +1169,8 @@ bool WebFrameLoaderClient::canShowMIMEType(const String& mime_type) const {
// "internally" (i.e. inside the browser) regardless of whether or not the
// browser or a plugin is doing the rendering.
- if (mime_util::IsSupportedMimeType(
- WideToASCII(webkit_glue::StringToStdWString(mime_type))))
+ if (net::IsSupportedMimeType(
+ WideToASCII(webkit_glue::StringToStdWString(mime_type))))
return true;
// See if the type is handled by an installed plugin, if so, we can show it.