summaryrefslogtreecommitdiffstats
path: root/base/location.h
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 10:46:48 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 10:46:48 +0000
commit9d43cd1f7d78bcb696401bd1ab7359a8d76fde81 (patch)
tree0e7912dd1372987a584f687fe263b248c03122aa /base/location.h
parentab39dc873522a528d61532fe3ab98d0d012caaff (diff)
downloadchromium_src-9d43cd1f7d78bcb696401bd1ab7359a8d76fde81.zip
chromium_src-9d43cd1f7d78bcb696401bd1ab7359a8d76fde81.tar.gz
chromium_src-9d43cd1f7d78bcb696401bd1ab7359a8d76fde81.tar.bz2
Revert 108752 - Support tracking of IPC messages as tasks in profiler
Also started to do more cleanup, including creating a base/profiler directory, and moving parts of the over-sized tracked_objects.* into that directory. r=rtenneti Review URL: http://codereview.chromium.org/8480014 TBR=jar@chromium.org Review URL: http://codereview.chromium.org/8496008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/location.h')
-rw-r--r--base/location.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/base/location.h b/base/location.h
index 2fbe62c..523bfaf 100644
--- a/base/location.h
+++ b/base/location.h
@@ -72,13 +72,11 @@ class BASE_EXPORT Location {
BASE_EXPORT const void* GetProgramCounter();
// Define a macro to record the current source location.
-#define FROM_HERE FROM_HERE_WITH_EXPLICIT_FUNCTION(__FUNCTION__)
-
-#define FROM_HERE_WITH_EXPLICIT_FUNCTION(function_name) \
- ::tracked_objects::Location(function_name, \
- __FILE__, \
- __LINE__, \
- ::tracked_objects::GetProgramCounter())
+#define FROM_HERE tracked_objects::Location( \
+ __FUNCTION__, \
+ __FILE__, \
+ __LINE__, \
+ tracked_objects::GetProgramCounter()) \
} // namespace tracked_objects