diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 20:27:08 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 20:27:08 +0000 |
| commit | 24f1756baceb15fec9b84482bf3ea69718d4760b (patch) | |
| tree | f407096520964d4867fed4ec7f02c64c87a92be3 /content/common/child_thread.h | |
| parent | cf20483084539712d2898cd43dbec7247ea15f38 (diff) | |
| download | chromium_src-24f1756baceb15fec9b84482bf3ea69718d4760b.zip chromium_src-24f1756baceb15fec9b84482bf3ea69718d4760b.tar.gz chromium_src-24f1756baceb15fec9b84482bf3ea69718d4760b.tar.bz2 | |
Revert 120789 - Propogate status setting for profiler to track parents
[There is a TSAN race report... so I'm reverting]
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/9181002
TBR=jar@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9348028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/child_thread.h')
| -rw-r--r-- | content/common/child_thread.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/common/child_thread.h b/content/common/child_thread.h index 4155a59..220985a 100644 --- a/content/common/child_thread.h +++ b/content/common/child_thread.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,7 +9,6 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" -#include "base/tracked_objects.h" #include "content/common/content_export.h" #include "content/common/message_router.h" #include "webkit/glue/resource_loader_bridge.h" @@ -93,7 +92,7 @@ class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener, virtual void OnSetIPCLoggingEnabled(bool enable); #endif - virtual void OnSetProfilerStatus(tracked_objects::ThreadData::Status status); + virtual void OnSetProfilerStatus(bool enable); virtual void OnGetChildProfilerData(int sequence_number, const std::string& process_type); |