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

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

Issue 478043005: Add the mp2t mimetype to the list of supported mime types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments from patch set #1. Created 6 years, 3 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 | « media/media.gyp ('k') | net/base/mime_util_unittest.cc » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 5 #include <algorithm>
6 #include <iterator> 6 #include <iterator>
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 // MPEG-4. 372 // MPEG-4.
373 "video/mp4", 373 "video/mp4",
374 "video/x-m4v", 374 "video/x-m4v",
375 "audio/mp4", 375 "audio/mp4",
376 "audio/x-m4a", 376 "audio/x-m4a",
377 377
378 // MP3. 378 // MP3.
379 "audio/mp3", 379 "audio/mp3",
380 "audio/x-mp3", 380 "audio/x-mp3",
381 "audio/mpeg", 381 "audio/mpeg",
382
383 #if defined(ENABLE_MPEG2TS_STREAM_PARSER)
384 // MPEG-2 TS.
385 "video/mp2t",
386 #endif
382 }; 387 };
383 388
384 // Note: 389 // Note:
385 // - does not include javascript types list (see supported_javascript_types) 390 // - does not include javascript types list (see supported_javascript_types)
386 // - does not include types starting with "text/" (see 391 // - does not include types starting with "text/" (see
387 // IsSupportedNonImageMimeType()) 392 // IsSupportedNonImageMimeType())
388 static const char* const supported_non_image_types[] = { 393 static const char* const supported_non_image_types[] = {
389 "image/svg+xml", // SVG is text-based XML, even though it has an image/ type 394 "image/svg+xml", // SVG is text-based XML, even though it has an image/ type
390 "application/xml", 395 "application/xml",
391 "application/atom+xml", 396 "application/atom+xml",
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 post_data->append("\r\n" + value + "\r\n"); 1365 post_data->append("\r\n" + value + "\r\n");
1361 } 1366 }
1362 1367
1363 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary, 1368 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary,
1364 std::string* post_data) { 1369 std::string* post_data) {
1365 DCHECK(post_data); 1370 DCHECK(post_data);
1366 post_data->append("--" + mime_boundary + "--\r\n"); 1371 post_data->append("--" + mime_boundary + "--\r\n");
1367 } 1372 }
1368 1373
1369 } // namespace net 1374 } // namespace net
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | net/base/mime_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698