diff options
| author | zhuoyu.qian <zhuoyu.qian@samsung.com> | 2015-02-24 21:28:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-25 05:29:12 +0000 |
| commit | c0b80de1f748956ed744d35c4c884e373dad8a53 (patch) | |
| tree | af2737525bbc53bc64c73511d8602b7e363e6e52 /chromecast | |
| parent | c6a36cdd86305aa691641fcfd6ded5a571510834 (diff) | |
| download | chromium_src-c0b80de1f748956ed744d35c4c884e373dad8a53.zip chromium_src-c0b80de1f748956ed744d35c4c884e373dad8a53.tar.gz chromium_src-c0b80de1f748956ed744d35c4c884e373dad8a53.tar.bz2 | |
Encrypted Media: Replace web_session_id with session_id
Now we don't have the integer session_id anymore,
there's no need to have a separate name.
So rename web_session_id to session_id.
BUG=440510
R=xhwang@chromium.org
Review URL: https://codereview.chromium.org/903663002
Cr-Commit-Position: refs/heads/master@{#317986}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/media/cdm/browser_cdm_cast.cc | 12 | ||||
| -rw-r--r-- | chromecast/media/cdm/browser_cdm_cast.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc index 766365a..ded9448 100644 --- a/chromecast/media/cdm/browser_cdm_cast.cc +++ b/chromecast/media/cdm/browser_cdm_cast.cc @@ -57,25 +57,25 @@ void BrowserCdmCast::UnregisterPlayer(int registration_id) { cdm_unset_callbacks_.erase(registration_id); } -void BrowserCdmCast::OnSessionMessage(const std::string& web_session_id, +void BrowserCdmCast::OnSessionMessage(const std::string& session_id, const std::vector<uint8>& message, const GURL& destination_url) { // Note: Message type is not supported in Chromecast. Do our best guess here. ::media::MediaKeys::MessageType message_type = destination_url.is_empty() ? ::media::MediaKeys::LICENSE_REQUEST : ::media::MediaKeys::LICENSE_RENEWAL; - session_message_cb_.Run(web_session_id, + session_message_cb_.Run(session_id, message_type, message, destination_url); } -void BrowserCdmCast::OnSessionClosed(const std::string& web_session_id) { - session_closed_cb_.Run(web_session_id); +void BrowserCdmCast::OnSessionClosed(const std::string& session_id) { + session_closed_cb_.Run(session_id); } void BrowserCdmCast::OnSessionKeysChange( - const std::string& web_session_id, + const std::string& session_id, const ::media::KeyIdAndKeyPairs& keys) { ::media::CdmKeysInfo cdm_keys_info; for (const std::pair<std::string, std::string>& key : keys) { @@ -84,7 +84,7 @@ void BrowserCdmCast::OnSessionKeysChange( cdm_key_information->key_id.assign(key.first.begin(), key.first.end()); cdm_keys_info.push_back(cdm_key_information.release()); } - session_keys_change_cb_.Run(web_session_id, true, cdm_keys_info.Pass()); + session_keys_change_cb_.Run(session_id, true, cdm_keys_info.Pass()); // Notify listeners of a new key. { diff --git a/chromecast/media/cdm/browser_cdm_cast.h b/chromecast/media/cdm/browser_cdm_cast.h index cd1eac1..2b9f26d 100644 --- a/chromecast/media/cdm/browser_cdm_cast.h +++ b/chromecast/media/cdm/browser_cdm_cast.h @@ -52,11 +52,11 @@ class BrowserCdmCast : public ::media::BrowserCdm { const std::string& key_id) = 0; protected: - void OnSessionMessage(const std::string& web_session_id, + void OnSessionMessage(const std::string& session_id, const std::vector<uint8>& message, const GURL& destination_url); - void OnSessionClosed(const std::string& web_session_id); - void OnSessionKeysChange(const std::string& web_session_id, + void OnSessionClosed(const std::string& session_id); + void OnSessionKeysChange(const std::string& session_id, const ::media::KeyIdAndKeyPairs& keys); private: |