summaryrefslogtreecommitdiffstats
path: root/chrome/common/child_thread.h
diff options
context:
space:
mode:
authordimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-26 19:16:16 +0000
committerdimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-26 19:16:16 +0000
commitecc0738c8ec3fe083ea639740e4a3ebbc695114d (patch)
treea72e92b51e43517066da693350282f6ccaed4161 /chrome/common/child_thread.h
parentbeda4150e41daa8f6aa91e788fccce2a3e9aca00 (diff)
downloadchromium_src-ecc0738c8ec3fe083ea639740e4a3ebbc695114d.zip
chromium_src-ecc0738c8ec3fe083ea639740e4a3ebbc695114d.tar.gz
chromium_src-ecc0738c8ec3fe083ea639740e4a3ebbc695114d.tar.bz2
Un-revert r39999, now with a Valgrind fix. Original change: http://codereview.chromium.org/647064
BUG=35963 TEST=WorkerTest.StressJSExecution Review URL: http://codereview.chromium.org/661139 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/child_thread.h')
-rw-r--r--chrome/common/child_thread.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index 2b55417..ee05e11 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -70,6 +70,10 @@ class ChildThread : public IPC::Channel::Listener,
IPC::SyncChannel* channel() { return channel_.get(); }
+ void set_on_channel_error_called(bool on_channel_error_called) {
+ on_channel_error_called_ = on_channel_error_called;
+ }
+
private:
void Init();
@@ -94,6 +98,10 @@ class ChildThread : public IPC::Channel::Listener,
// that would addref it.
bool check_with_browser_before_shutdown_;
+ // The OnChannelError() callback was invoked - the channel is dead, don't
+ // attempt to communicate.
+ bool on_channel_error_called_;
+
MessageLoop* message_loop_;
scoped_ptr<NotificationService> notification_service_;