summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 23:06:59 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 23:06:59 +0000
commitc0bcb01f4d832c493e320198ac31f31cc067fc5d (patch)
tree2c73446e0411c964bd81e13ecf0028d638af4bfe /base
parent6828b76c92b1d364898535ceb16fcfa51e1caa07 (diff)
downloadchromium_src-c0bcb01f4d832c493e320198ac31f31cc067fc5d.zip
chromium_src-c0bcb01f4d832c493e320198ac31f31cc067fc5d.tar.gz
chromium_src-c0bcb01f4d832c493e320198ac31f31cc067fc5d.tar.bz2
Add ToString() method to tracked_objects::Location
Remove ad-hoc functions in sync to do the same thing and use Location::ToString() instead. BUG= TEST= Review URL: http://codereview.chromium.org/7919013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/tracked.cc6
-rw-r--r--base/tracked.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/base/tracked.cc b/base/tracked.cc
index 124e721..517591b 100644
--- a/base/tracked.cc
+++ b/base/tracked.cc
@@ -13,6 +13,7 @@ void* _ReturnAddress();
#include "base/tracked.h"
+#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/tracked_objects.h"
@@ -39,6 +40,11 @@ Location::Location()
program_counter_(NULL) {
}
+std::string Location::ToString() const {
+ return std::string(function_name_) + "@" + file_name_ + ":" +
+ base::IntToString(line_number_);
+}
+
void Location::Write(bool display_filename, bool display_function_name,
std::string* output) const {
base::StringAppendF(output, "%s[%d] ",
diff --git a/base/tracked.h b/base/tracked.h
index 3c73519..337f3e0 100644
--- a/base/tracked.h
+++ b/base/tracked.h
@@ -68,6 +68,8 @@ class BASE_EXPORT Location {
int line_number() const { return line_number_; }
const void* program_counter() const { return program_counter_; }
+ std::string ToString() const;
+
void Write(bool display_filename, bool display_function_name,
std::string* output) const;