summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerg <erg@chromium.org>2015-04-15 15:48:53 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-15 22:49:13 +0000
commite8c2b8023fad6eff29ccac7dd339e0be17896bab (patch)
tree425f77d95e474c32993d8e4b352b4276926c5569
parent707c3acd012287f3b4897bedaf57c60fbd4044bd (diff)
downloadchromium_src-e8c2b8023fad6eff29ccac7dd339e0be17896bab.zip
chromium_src-e8c2b8023fad6eff29ccac7dd339e0be17896bab.tar.gz
chromium_src-e8c2b8023fad6eff29ccac7dd339e0be17896bab.tar.bz2
html_viewer: Implement various mime utilities.
We now render the Bing frontpage without any NOTIMPLEMENTED() spam. BUG=none Review URL: https://codereview.chromium.org/1088363002 Cr-Commit-Position: refs/heads/master@{#325331}
-rw-r--r--mojo/services/html_viewer/webmimeregistry_impl.cc18
1 files changed, 12 insertions, 6 deletions
diff --git a/mojo/services/html_viewer/webmimeregistry_impl.cc b/mojo/services/html_viewer/webmimeregistry_impl.cc
index 0b7b689..9878e87 100644
--- a/mojo/services/html_viewer/webmimeregistry_impl.cc
+++ b/mojo/services/html_viewer/webmimeregistry_impl.cc
@@ -111,20 +111,26 @@ blink::WebMimeRegistry::SupportsType
blink::WebString WebMimeRegistryImpl::mimeTypeForExtension(
const blink::WebString& file_extension) {
- NOTIMPLEMENTED();
- return blink::WebString();
+ std::string mime_type;
+ net::GetMimeTypeFromExtension(
+ base::FilePath::FromUTF16Unsafe(file_extension).value(), &mime_type);
+ return blink::WebString::fromUTF8(mime_type);
}
blink::WebString WebMimeRegistryImpl::wellKnownMimeTypeForExtension(
const blink::WebString& file_extension) {
- NOTIMPLEMENTED();
- return blink::WebString();
+ std::string mime_type;
+ net::GetWellKnownMimeTypeFromExtension(
+ base::FilePath::FromUTF16Unsafe(file_extension).value(), &mime_type);
+ return blink::WebString::fromUTF8(mime_type);
}
blink::WebString WebMimeRegistryImpl::mimeTypeFromFile(
const blink::WebString& file_path) {
- NOTIMPLEMENTED();
- return blink::WebString();
+ std::string mime_type;
+ net::GetMimeTypeFromFile(base::FilePath::FromUTF16Unsafe(file_path),
+ &mime_type);
+ return blink::WebString::fromUTF8(mime_type);
}
} // namespace html_viewer