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

Unified Diff: net/base/mime_util.cc

Issue 239993009: Revert accidental dartium code push (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « net/base/mime_util.h ('k') | net/base/network_change_notifier_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/mime_util.cc
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index c0b8d368e9cc55c96a79a2ae2c14ae0c795f5f47..4679dcc02e06e94a52641e6f388088eec5f9f313 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);
}
« no previous file with comments | « net/base/mime_util.h ('k') | net/base/network_change_notifier_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698