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

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

Issue 159683: add application/ogg mime type... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 4 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 "image/x-icon", // ico 178 "image/x-icon", // ico
179 "image/x-xbitmap" // xbm 179 "image/x-xbitmap" // xbm
180 }; 180 };
181 181
182 // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type 182 // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
183 // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php 183 // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
184 static const char* const supported_media_types[] = { 184 static const char* const supported_media_types[] = {
185 // Ogg. 185 // Ogg.
186 "video/ogg", 186 "video/ogg",
187 "audio/ogg", 187 "audio/ogg",
188 "application/ogg",
188 189
189 #if defined(GOOGLE_CHROME_BUILD) 190 #if defined(GOOGLE_CHROME_BUILD)
190 // MPEG-4. 191 // MPEG-4.
191 "video/mp4", 192 "video/mp4",
192 "video/x-m4v", 193 "video/x-m4v",
193 "audio/mp4", 194 "audio/mp4",
194 "audio/x-m4a", 195 "audio/x-m4a",
195 196
196 // MP3. 197 // MP3.
197 "audio/mp3", 198 "audio/mp3",
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs) { 436 bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs) {
436 return GetMimeUtil()->AreSupportedMediaCodecs(codecs); 437 return GetMimeUtil()->AreSupportedMediaCodecs(codecs);
437 } 438 }
438 439
439 void ParseCodecString(const std::string& codecs, 440 void ParseCodecString(const std::string& codecs,
440 std::vector<std::string>* codecs_out) { 441 std::vector<std::string>* codecs_out) {
441 GetMimeUtil()->ParseCodecString(codecs, codecs_out); 442 GetMimeUtil()->ParseCodecString(codecs, codecs_out);
442 } 443 }
443 444
444 } // namespace net 445 } // 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