summaryrefslogtreecommitdiffstats
path: root/net/base/mime_util.cc
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 16:50:56 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 16:50:56 +0000
commit9a5bb05bd1e76b7923382dc058ca958818febce3 (patch)
treea192c51fde864453816cdd9465331a57e1c66443 /net/base/mime_util.cc
parentb8faca2407cf7e3692d7ce9ff0a7aafc9a76cae1 (diff)
downloadchromium_src-9a5bb05bd1e76b7923382dc058ca958818febce3.zip
chromium_src-9a5bb05bd1e76b7923382dc058ca958818febce3.tar.gz
chromium_src-9a5bb05bd1e76b7923382dc058ca958818febce3.tar.bz2
Revert accidental dartium code push
This reverts r264517 to r264538 from terry@google.com BUG=none TEST=none NOTRY=true NOTREECHECKS=true TBR=terry@google.com Review URL: https://codereview.chromium.org/239993009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mime_util.cc')
-rw-r--r--net/base/mime_util.cc20
1 files changed, 0 insertions, 20 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index c0b8d36..4679dcc 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -63,7 +63,6 @@ class MimeUtil : public PlatformMimeUtil {
bool IsSupportedNonImageMimeType(const std::string& mime_type) const;
bool IsUnsupportedTextMimeType(const std::string& mime_type) const;
bool IsSupportedJavascriptMimeType(const std::string& mime_type) const;
- bool IsSupportedDartMimeType(const std::string& mime_type) const;
bool IsSupportedMimeType(const std::string& mime_type) const;
@@ -110,7 +109,6 @@ class MimeUtil : public PlatformMimeUtil {
MimeMappings non_image_map_;
MimeMappings unsupported_text_map_;
MimeMappings javascript_map_;
- MimeMappings dart_map_;
MimeMappings codecs_map_;
StrictMappings strict_format_map_;
@@ -152,7 +150,6 @@ static const MimeInfo secondary_mappings[] = {
{ "application/pdf", "pdf" },
{ "application/postscript", "ps,eps,ai" },
{ "application/javascript", "js" },
- { "application/dart", "dart" },
{ "application/font-woff", "woff" },
{ "image/bmp", "bmp" },
{ "image/x-icon", "ico" },
@@ -429,10 +426,6 @@ static bool IsCodecSupportedOnAndroid(const std::string& codec) {
}
#endif
-static const char* const supported_dart_types[] = {
- "application/dart",
-};
-
struct MediaFormatStrict {
const char* mime_type;
const char* codecs_list;
@@ -475,8 +468,6 @@ void MimeUtil::InitializeMimeTypeMaps() {
unsupported_text_map_.insert(unsupported_text_types[i]);
for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
non_image_map_.insert(supported_javascript_types[i]);
- for (size_t i = 0; i < arraysize(supported_dart_types); ++i)
- non_image_map_.insert(supported_dart_types[i]);
for (size_t i = 0; i < arraysize(common_media_types); ++i)
non_image_map_.insert(common_media_types[i]);
#if defined(USE_PROPRIETARY_CODECS)
@@ -494,8 +485,6 @@ void MimeUtil::InitializeMimeTypeMaps() {
for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
javascript_map_.insert(supported_javascript_types[i]);
- for (size_t i = 0; i < arraysize(supported_dart_types); ++i)
- dart_map_.insert(supported_dart_types[i]);
for (size_t i = 0; i < arraysize(common_media_codecs); ++i) {
#if defined(OS_ANDROID)
@@ -553,11 +542,6 @@ bool MimeUtil::IsSupportedJavascriptMimeType(
return javascript_map_.find(mime_type) != javascript_map_.end();
}
-bool MimeUtil::IsSupportedDartMimeType(
- const std::string& mime_type) const {
- return dart_map_.find(mime_type) != dart_map_.end();
-}
-
// Mirrors WebViewImpl::CanShowMIMEType()
bool MimeUtil::IsSupportedMimeType(const std::string& mime_type) const {
return (mime_type.compare(0, 6, "image/") == 0 &&
@@ -780,10 +764,6 @@ bool IsSupportedJavascriptMimeType(const std::string& mime_type) {
return g_mime_util.Get().IsSupportedJavascriptMimeType(mime_type);
}
-bool IsSupportedDartMimeType(const std::string& mime_type) {
- return g_mime_util.Get().IsSupportedDartMimeType(mime_type);
-}
-
bool IsSupportedMimeType(const std::string& mime_type) {
return g_mime_util.Get().IsSupportedMimeType(mime_type);
}