summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenchan <benchan@chromium.org>2014-08-25 04:16:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-25 11:17:48 +0000
commit5d15ab5892635c504e8efff9c81e4dd8dc3de492 (patch)
tree3b2bc36d6ce3d2811c341744ac08929b2a2dbedd
parenta82dcc326db83837d52a65ab58e8c226a764d79a (diff)
downloadchromium_src-5d15ab5892635c504e8efff9c81e4dd8dc3de492.zip
chromium_src-5d15ab5892635c504e8efff9c81e4dd8dc3de492.tar.gz
chromium_src-5d15ab5892635c504e8efff9c81e4dd8dc3de492.tar.bz2
Undo a rename of dbus::Message::GetSignature.
dbus::Message::GetSignature() was incorrectly renamed to dbus::Message::GetDataSigature() in https://codereview.chromium.org/502793002. This CL undoes that. BUG=None TEST=dbus_unittests Review URL: https://codereview.chromium.org/494263003 Cr-Commit-Position: refs/heads/master@{#291660}
-rw-r--r--dbus/message.cc4
-rw-r--r--dbus/message.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/dbus/message.cc b/dbus/message.cc
index a7310f3..ddcf85f 100644
--- a/dbus/message.cc
+++ b/dbus/message.cc
@@ -262,7 +262,7 @@ std::string Message::ToString() {
AppendStringHeader("member", GetMember(), &headers);
AppendStringHeader("error_name", GetErrorName(), &headers);
AppendStringHeader("sender", GetSender(), &headers);
- AppendStringHeader("signature", GetDataSignature(), &headers);
+ AppendStringHeader("signature", GetSignature(), &headers);
AppendUint32Header("serial", GetSerial(), &headers);
AppendUint32Header("reply_serial", GetReplySerial(), &headers);
@@ -333,7 +333,7 @@ std::string Message::GetSender() {
return sender ? sender : "";
}
-std::string Message::GetDataSignature() {
+std::string Message::GetSignature() {
const char* signature = dbus_message_get_signature(raw_message_);
return signature ? signature : "";
}
diff --git a/dbus/message.h b/dbus/message.h
index d29e5e4..780e6c5 100644
--- a/dbus/message.h
+++ b/dbus/message.h
@@ -111,7 +111,7 @@ class CHROME_DBUS_EXPORT Message {
std::string GetMember();
std::string GetErrorName();
std::string GetSender();
- std::string GetDataSignature();
+ std::string GetSignature();
// Gets the serial and reply serial numbers. Returns 0 if not set.
uint32 GetSerial();
uint32 GetReplySerial();