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

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

Issue 3554001: add audio/x-wav mimetype for apache... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 2 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "net/base/mime_util.h" 8 #include "net/base/mime_util.h"
9 #include "net/base/platform_mime_util.h" 9 #include "net/base/platform_mime_util.h"
10 10
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type 202 // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
203 // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php 203 // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
204 static const char* const supported_media_types[] = { 204 static const char* const supported_media_types[] = {
205 // Ogg. 205 // Ogg.
206 "video/ogg", 206 "video/ogg",
207 "audio/ogg", 207 "audio/ogg",
208 "application/ogg", 208 "application/ogg",
209 "video/webm", 209 "video/webm",
210 "audio/webm", 210 "audio/webm",
211 "audio/wav", 211 "audio/wav",
212 "audio/x-wav",
212 213
213 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) 214 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
214 // MPEG-4. 215 // MPEG-4.
215 "video/mp4", 216 "video/mp4",
216 "video/x-m4v", 217 "video/x-m4v",
217 "audio/mp4", 218 "audio/mp4",
218 "audio/x-m4a", 219 "audio/x-m4a",
219 220
220 // MP3. 221 // MP3.
221 "audio/mp3", 222 "audio/mp3",
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 706
706 GetExtensionsFromHardCodedMappings(secondary_mappings, 707 GetExtensionsFromHardCodedMappings(secondary_mappings,
707 arraysize(secondary_mappings), 708 arraysize(secondary_mappings),
708 mime_type, 709 mime_type,
709 &unique_extensions); 710 &unique_extensions);
710 711
711 HashSetToVector(&unique_extensions, extensions); 712 HashSetToVector(&unique_extensions, extensions);
712 } 713 }
713 714
714 } // namespace net 715 } // 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