summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp
diff options
context:
space:
mode:
authorxhwang <xhwang@chromium.org>2015-04-02 00:25:28 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-02 07:26:05 +0000
commit954caddd82139814f6015c7807ec41b4076df103 (patch)
treefd182ec3dd96d039087c3f08afc40927235f785b /ppapi/cpp
parent23f7c8932139a33ec7c1a2287c91f5b83dddd3dd (diff)
downloadchromium_src-954caddd82139814f6015c7807ec41b4076df103.zip
chromium_src-954caddd82139814f6015c7807ec41b4076df103.tar.gz
chromium_src-954caddd82139814f6015c7807ec41b4076df103.tar.bz2
media: Rename SessionError to LegacySessionError.
Generated using sed: OnSessionError -> OnLegacySessionError SessionErrorCB -> LegacySessionErrorCB session_error_cb -> legacy_session_error_cb TBR=dcheng@chromium.org,isherman@chromium.org BUG=448818 Review URL: https://codereview.chromium.org/1042273004 Cr-Commit-Position: refs/heads/master@{#323442}
Diffstat (limited to 'ppapi/cpp')
-rw-r--r--ppapi/cpp/private/content_decryptor_private.cc4
-rw-r--r--ppapi/cpp/private/content_decryptor_private.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc
index e390ccc..d14bd0e 100644
--- a/ppapi/cpp/private/content_decryptor_private.cc
+++ b/ppapi/cpp/private/content_decryptor_private.cc
@@ -353,7 +353,7 @@ void ContentDecryptor_Private::SessionClosed(const std::string& session_id) {
}
}
-void ContentDecryptor_Private::SessionError(
+void ContentDecryptor_Private::LegacySessionError(
const std::string& session_id,
PP_CdmExceptionCode exception_code,
uint32_t system_code,
@@ -361,7 +361,7 @@ void ContentDecryptor_Private::SessionError(
if (has_interface<PPB_ContentDecryptor_Private>()) {
pp::Var session_id_var(session_id);
pp::Var error_description_var(error_description);
- get_interface<PPB_ContentDecryptor_Private>()->SessionError(
+ get_interface<PPB_ContentDecryptor_Private>()->LegacySessionError(
associated_instance_.pp_instance(), session_id_var.pp_var(),
exception_code, system_code, error_description_var.pp_var());
}
diff --git a/ppapi/cpp/private/content_decryptor_private.h b/ppapi/cpp/private/content_decryptor_private.h
index 39bfdd7..1b18b3a 100644
--- a/ppapi/cpp/private/content_decryptor_private.h
+++ b/ppapi/cpp/private/content_decryptor_private.h
@@ -91,10 +91,10 @@ class ContentDecryptor_Private {
void SessionExpirationChange(const std::string& session_id,
PP_Time new_expiry_time);
void SessionClosed(const std::string& session_id);
- void SessionError(const std::string& session_id,
- PP_CdmExceptionCode exception_code,
- uint32_t system_code,
- const std::string& error_description);
+ void LegacySessionError(const std::string& session_id,
+ PP_CdmExceptionCode exception_code,
+ uint32_t system_code,
+ const std::string& error_description);
// The plugin must not hold a reference to the encrypted buffer resource
// provided to Decrypt() when it calls this method. The browser will reuse