diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
| commit | 424c4d7b64af9d0d8fd9624f381f469654d5e3d2 (patch) | |
| tree | af8b16dc2ba7fc8c8bb1c9fa18b907c847f3883d /media/base/media_keys.h | |
| parent | c70ef2906f891fe7d218980660e4cda465717916 (diff) | |
| download | chromium_org-424c4d7b64af9d0d8fd9624f381f469654d5e3d2.tar.gz | |
Merge from Chromium at DEPS revision r220549
This commit was generated by merge_to_master.py.
Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
Diffstat (limited to 'media/base/media_keys.h')
| -rw-r--r-- | media/base/media_keys.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/base/media_keys.h b/media/base/media_keys.h index 482248394f..cf170f0cae 100644 --- a/media/base/media_keys.h +++ b/media/base/media_keys.h @@ -82,8 +82,7 @@ typedef base::Callback<void(const std::string& session_id, typedef base::Callback<void(const std::string& session_id, const std::string& type, - scoped_ptr<uint8[]> init_data, - int init_data_size)> NeedKeyCB; + const std::vector<uint8>& init_data)> NeedKeyCB; } // namespace media |