summaryrefslogtreecommitdiffstats
path: root/content/common/child_process_messages.h
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-10 19:43:42 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-10 19:43:42 +0000
commit702a12dae9a2ed34362e381df7419c314e4124bf (patch)
treec9980ba18234d26584d03629600e06996744e7ce /content/common/child_process_messages.h
parentc07eef4e772952ab4ad0213b581c97e92f00831e (diff)
downloadchromium_src-702a12dae9a2ed34362e381df7419c314e4124bf.zip
chromium_src-702a12dae9a2ed34362e381df7419c314e4124bf.tar.gz
chromium_src-702a12dae9a2ed34362e381df7419c314e4124bf.tar.bz2
Propogate status setting for profiler to track parents
[Reland: https://src.chromium.org/viewvc/chrome?view=rev&revision=120789 with minor change to avoid race on status change.] This allows child processes to track ancestry, and report it to the browser process. Parent tracking is only turned on based on an environment variable. r=rtenneti Review URL: https://chromiumcodereview.appspot.com/9363007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/child_process_messages.h')
-rw-r--r--content/common/child_process_messages.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h
index 0e679b8..ab56be0 100644
--- a/content/common/child_process_messages.h
+++ b/content/common/child_process_messages.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,11 +6,14 @@
// Multiply-included message file, hence no include guard.
#include "base/shared_memory.h"
+#include "base/tracked_objects.h"
#include "base/values.h"
#include "content/common/content_export.h"
#include "googleurl/src/gurl.h"
#include "ipc/ipc_message_macros.h"
+IPC_ENUM_TRAITS(tracked_objects::ThreadData::Status)
+
#undef IPC_MESSAGE_EXPORT
#define IPC_MESSAGE_EXPORT CONTENT_EXPORT
@@ -41,7 +44,7 @@ IPC_MESSAGE_CONTROL0(ChildProcessMsg_GetTraceBufferPercentFull)
// Tell the child process to enable or disable the profiler status.
IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetProfilerStatus,
- bool /* profiler status */)
+ tracked_objects::ThreadData::Status /* profiler status */)
// Send to all the child processes to send back profiler data (ThreadData in
// tracked_objects).