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

Side by Side Diff: net/base/mime_util.cc

Issue 149241: Add mpeg for layouttests to pass. The following media layout tests fail if m... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "net/base/mime_util.h" 7 #include "net/base/mime_util.h"
8 #include "net/base/platform_mime_util.h" 8 #include "net/base/platform_mime_util.h"
9 9
10 #include "base/hash_tables.h" 10 #include "base/hash_tables.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 // MPEG-4. 184 // MPEG-4.
185 "video/mp4", 185 "video/mp4",
186 "video/x-m4v", 186 "video/x-m4v",
187 "audio/mp4", 187 "audio/mp4",
188 "audio/x-m4a", 188 "audio/x-m4a",
189 189
190 // MP3. 190 // MP3.
191 "audio/mp3", 191 "audio/mp3",
192 "audio/x-mp3", 192 "audio/x-mp3",
193
194 // Generic MPEG mime-types.
195 // TODO(fbarchard): Remove these when layout tests stop using mpg.
196 "audio/mpeg",
197 "video/mpeg"
193 }; 198 };
194 199
195 // Note: does not include javascript types list (see supported_javascript_types) 200 // Note: does not include javascript types list (see supported_javascript_types)
196 static const char* const supported_non_image_types[] = { 201 static const char* const supported_non_image_types[] = {
197 "text/html", 202 "text/html",
198 "text/xml", 203 "text/xml",
199 "text/xsl", 204 "text/xsl",
200 "text/plain", 205 "text/plain",
201 // Many users complained about css files served for 206 // Many users complained about css files served for
202 // download instead of displaying in the browser: 207 // download instead of displaying in the browser:
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 bool IsSupportedMimeType(const std::string& mime_type) { 382 bool IsSupportedMimeType(const std::string& mime_type) {
378 return GetMimeUtil()->IsSupportedMimeType(mime_type); 383 return GetMimeUtil()->IsSupportedMimeType(mime_type);
379 } 384 }
380 385
381 bool MatchesMimeType(const std::string &mime_type_pattern, 386 bool MatchesMimeType(const std::string &mime_type_pattern,
382 const std::string &mime_type) { 387 const std::string &mime_type) {
383 return GetMimeUtil()->MatchesMimeType(mime_type_pattern, mime_type); 388 return GetMimeUtil()->MatchesMimeType(mime_type_pattern, mime_type);
384 } 389 }
385 390
386 } // namespace net 391 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698