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

Side by Side Diff: media/webm/webm_tracks_parser.cc

Issue 16684003: Use a direct include of strings headers in ipc/, jingle/, media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/video/capture/win/video_capture_device_win.cc ('k') | 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) 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 "media/webm/webm_tracks_parser.h" 5 #include "media/webm/webm_tracks_parser.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "media/base/buffers.h" 9 #include "media/base/buffers.h"
10 #include "media/webm/webm_constants.h" 10 #include "media/webm/webm_constants.h"
11 #include "media/webm/webm_content_encodings.h" 11 #include "media/webm/webm_content_encodings.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 static TextKind CodecIdToTextKind(const std::string& codec_id) { 15 static TextKind CodecIdToTextKind(const std::string& codec_id) {
16 if (codec_id == kWebMCodecSubtitles) 16 if (codec_id == kWebMCodecSubtitles)
17 return kTextSubtitles; 17 return kTextSubtitles;
18 18
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 269
270 if (id == kWebMIdLanguage) { 270 if (id == kWebMIdLanguage) {
271 track_language_ = str; 271 track_language_ = str;
272 return true; 272 return true;
273 } 273 }
274 274
275 return true; 275 return true;
276 } 276 }
277 277
278 } // namespace media 278 } // namespace media
OLDNEW
« no previous file with comments | « media/video/capture/win/video_capture_device_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698