summaryrefslogtreecommitdiffstats
path: root/base/trace_event.cc
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 15:01:12 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 15:01:12 +0000
commit52a261f59b20e89f8c5936bce642362f8e367b57 (patch)
treefcc7b3c100caaf43848cd9a241beafc883f93b7d /base/trace_event.cc
parent7d926f9072ac496db6df715cc6a6bd5d3f9bd011 (diff)
downloadchromium_src-52a261f59b20e89f8c5936bce642362f8e367b57.zip
chromium_src-52a261f59b20e89f8c5936bce642362f8e367b57.tar.gz
chromium_src-52a261f59b20e89f8c5936bce642362f8e367b57.tar.bz2
NO CODE CHANGE (except one global std::wstring changed to const wchar_t* const per style compliance).
Preliminary work to enforce new PRESUBMIT.py rules: - <=80 cols - no trailing whitespaces - svn:eol-style=LF git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/trace_event.cc')
-rw-r--r--base/trace_event.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/base/trace_event.cc b/base/trace_event.cc
index 5b4ec36..400e878 100644
--- a/base/trace_event.cc
+++ b/base/trace_event.cc
@@ -102,22 +102,22 @@ bool TraceLog::OpenLogFile() {
return true;
}
-void TraceLog::Trace(const std::string& name,
+void TraceLog::Trace(const std::string& name,
EventType type,
const void* id,
const std::wstring& extra,
- const char* file,
+ const char* file,
int line) {
if (!enabled_)
return;
Trace(name, type, id, WideToUTF8(extra), file, line);
}
-void TraceLog::Trace(const std::string& name,
+void TraceLog::Trace(const std::string& name,
EventType type,
const void* id,
const std::string& extra,
- const char* file,
+ const char* file,
int line) {
if (!enabled_)
return;
@@ -129,7 +129,7 @@ void TraceLog::Trace(const std::string& name,
#endif
TimeDelta delta = tick - trace_start_time_;
int64 usec = delta.InMicroseconds();
- std::string msg =
+ std::string msg =
StringPrintf("{'pid':'0x%lx', 'tid':'0x%lx', 'type':'%s', "
"'name':'%s', 'id':'0x%lx', 'extra':'%s', 'file':'%s', "
"'line_number':'%d', 'usec_begin': %I64d},\n",