| OLD | NEW |
|---|
| 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 #ifndef MEDIA_BASE_TEXT_TRACK_H_ | 5 #ifndef MEDIA_BASE_TEXT_TRACK_H_ |
| 6 #define MEDIA_BASE_TEXT_TRACK_H_ | 6 #define MEDIA_BASE_TEXT_TRACK_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/time.h" | 12 #include "base/time/time.h" |
| 13 | 13 |
| 14 namespace media { | 14 namespace media { |
| 15 | 15 |
| 16 // Specifies the varieties of text tracks. | 16 // Specifies the varieties of text tracks. |
| 17 enum TextKind { | 17 enum TextKind { |
| 18 kTextSubtitles, | 18 kTextSubtitles, |
| 19 kTextCaptions, | 19 kTextCaptions, |
| 20 kTextDescriptions, | 20 kTextDescriptions, |
| 21 kTextMetadata, | 21 kTextMetadata, |
| 22 kTextNone | 22 kTextNone |
| (...skipping 10 matching lines...) Expand all Loading... |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 typedef base::Callback<scoped_ptr<TextTrack> | 35 typedef base::Callback<scoped_ptr<TextTrack> |
| 36 (TextKind kind, | 36 (TextKind kind, |
| 37 const std::string& label, | 37 const std::string& label, |
| 38 const std::string& language)> AddTextTrackCB; | 38 const std::string& language)> AddTextTrackCB; |
| 39 | 39 |
| 40 } // namespace media | 40 } // namespace media |
| 41 | 41 |
| 42 #endif // MEDIA_BASE_TEXT_TRACK_H_ | 42 #endif // MEDIA_BASE_TEXT_TRACK_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 18052007:
Use a direct include of time headers in media/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src