summaryrefslogtreecommitdiffstats
path: root/chrome/common/child_thread.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 16:40:17 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 16:40:17 +0000
commitea7d96f31cd0cdef3e0e0926744fe672d35537a0 (patch)
tree73ac764e80c47e7aec70bba15c70264a7cb6b255 /chrome/common/child_thread.h
parent5eeef7b811f482b57db0ae33623c436370dd3c83 (diff)
downloadchromium_src-ea7d96f31cd0cdef3e0e0926744fe672d35537a0.zip
chromium_src-ea7d96f31cd0cdef3e0e0926744fe672d35537a0.tar.gz
chromium_src-ea7d96f31cd0cdef3e0e0926744fe672d35537a0.tar.bz2
Fix single process mode and the unit_tests on Linux.
argh, this used to work in my previous change but it must have regressed before checkin. Review URL: http://codereview.chromium.org/155846 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/child_thread.h')
-rw-r--r--chrome/common/child_thread.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index 86eae4c..a7074c7 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -19,6 +19,8 @@ class ChildThread : public IPC::Channel::Listener,
public:
// Creates the thread.
ChildThread();
+ // Used for single-process mode.
+ ChildThread(const std::string channel_name);
virtual ~ChildThread();
// IPC::Message::Sender implementation:
@@ -40,9 +42,6 @@ class ChildThread : public IPC::Channel::Listener,
protected:
friend class ChildProcess;
- // Overrides the channel name. Used for --single-process mode.
- void SetChannelName(const std::string& name) { channel_name_ = name; }
-
// Called when the process refcount is 0.
void OnProcessFinalRelease();
@@ -51,6 +50,8 @@ class ChildThread : public IPC::Channel::Listener,
IPC::SyncChannel* channel() { return channel_.get(); }
private:
+ void Init();
+
// IPC::Channel::Listener implementation:
virtual void OnMessageReceived(const IPC::Message& msg);
virtual void OnChannelError();