diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /media/base/text_track.h | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'media/base/text_track.h')
| -rw-r--r-- | media/base/text_track.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/media/base/text_track.h b/media/base/text_track.h index 01a2ed727f..0e04a0eb46 100644 --- a/media/base/text_track.h +++ b/media/base/text_track.h @@ -13,14 +13,7 @@ namespace media { -// Specifies the varieties of text tracks. -enum TextKind { - kTextSubtitles, - kTextCaptions, - kTextDescriptions, - kTextMetadata, - kTextNone -}; +class TextTrackConfig; class TextTrack { public: @@ -32,10 +25,12 @@ class TextTrack { const std::string& settings) = 0; }; -typedef base::Callback<scoped_ptr<TextTrack> - (TextKind kind, - const std::string& label, - const std::string& language)> AddTextTrackCB; +typedef base::Callback<void + (scoped_ptr<TextTrack>)> AddTextTrackDoneCB; + +typedef base::Callback<void + (const TextTrackConfig& config, + const AddTextTrackDoneCB& done_cb)> AddTextTrackCB; } // namespace media |