diff options
author | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
commit | 4e180b6a0b4720a9b8e9e959a882386f690f08ff (patch) | |
tree | 788435d09362885908ba5ba9ef868b852ca82c0b /media/base/media_keys.h | |
parent | 1179b92b08db0c652a0cf003ab4d89b31ce3610f (diff) | |
download | chromium_org-4e180b6a0b4720a9b8e9e959a882386f690f08ff.tar.gz |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
Diffstat (limited to 'media/base/media_keys.h')
-rw-r--r-- | media/base/media_keys.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/media/base/media_keys.h b/media/base/media_keys.h index 9369c50b56..c0fc56af34 100644 --- a/media/base/media_keys.h +++ b/media/base/media_keys.h @@ -79,11 +79,6 @@ typedef base::Callback<void(const std::string& session_id, typedef base::Callback<void(const std::string& session_id, const std::vector<uint8>& message, const std::string& default_url)> KeyMessageCB; - -typedef base::Callback<void(const std::string& session_id, - const std::string& type, - const std::vector<uint8>& init_data)> NeedKeyCB; - } // namespace media #endif // MEDIA_BASE_MEDIA_KEYS_H_ |