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

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

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « net/base/filename_util_unittest.cc ('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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 // MPEG-4. 352 // MPEG-4.
353 "video/mp4", 353 "video/mp4",
354 "video/x-m4v", 354 "video/x-m4v",
355 "audio/mp4", 355 "audio/mp4",
356 "audio/x-m4a", 356 "audio/x-m4a",
357 357
358 // MP3. 358 // MP3.
359 "audio/mp3", 359 "audio/mp3",
360 "audio/x-mp3", 360 "audio/x-mp3",
361 "audio/mpeg", 361 "audio/mpeg",
362 "audio/aac",
362 363
363 #if defined(ENABLE_MPEG2TS_STREAM_PARSER) 364 #if defined(ENABLE_MPEG2TS_STREAM_PARSER)
364 // MPEG-2 TS. 365 // MPEG-2 TS.
365 "video/mp2t", 366 "video/mp2t",
366 #endif 367 #endif
367 }; 368 };
368 369
369 // Note: 370 // Note:
370 // - does not include javascript types list (see supported_javascript_types) 371 // - does not include javascript types list (see supported_javascript_types)
371 // - does not include types starting with "text/" (see 372 // - does not include types starting with "text/" (see
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 post_data->append("\r\n" + value + "\r\n"); 1380 post_data->append("\r\n" + value + "\r\n");
1380 } 1381 }
1381 1382
1382 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary, 1383 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary,
1383 std::string* post_data) { 1384 std::string* post_data) {
1384 DCHECK(post_data); 1385 DCHECK(post_data);
1385 post_data->append("--" + mime_boundary + "--\r\n"); 1386 post_data->append("--" + mime_boundary + "--\r\n");
1386 } 1387 }
1387 1388
1388 } // namespace net 1389 } // namespace net
OLDNEW
« no previous file with comments | « net/base/filename_util_unittest.cc ('k') | net/base/mime_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698