diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 03:25:15 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 03:25:15 +0000 |
| commit | 176aa48371da91eb98d675d87b4e70c7b26d696f (patch) | |
| tree | 4c972de6ecd5a54650ab1dc7d421187f5d25834f /base/trace_event.h | |
| parent | 9a3f0ac2899139ace97e399015259d028b4d5704 (diff) | |
| download | chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.zip chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.gz chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.bz2 | |
Add Terminate() to the Process object, have RenderProcessHost use this to avoid some more Windows specific code.
Move Process and SharedMemory into the base namespace (most changes).
Review URL: http://codereview.chromium.org/10895
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/trace_event.h')
| -rw-r--r-- | base/trace_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/trace_event.h b/base/trace_event.h index fc531ec..131af46 100644 --- a/base/trace_event.h +++ b/base/trace_event.h @@ -73,7 +73,7 @@ #define TRACE_EVENT_INSTANT(name, id, extra) #endif -namespace process_util { +namespace base { class ProcessMetrics; } @@ -126,7 +126,7 @@ class TraceLog { FILE* log_file_; Lock file_lock_; TimeTicks trace_start_time_; - scoped_ptr<process_util::ProcessMetrics> process_metrics_; + scoped_ptr<base::ProcessMetrics> process_metrics_; RepeatingTimer<TraceLog> timer_; }; |