diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 22:38:31 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 22:38:31 +0000 |
| commit | 90a253bf27e88f424afde35b561270fe52163763 (patch) | |
| tree | 01f15e8333af8d564aab3de2231d4476ff801347 /content/common/child_process.h | |
| parent | d2b1b7e5fcd3e73d5a5ae927c3c6a2eda70a4673 (diff) | |
| download | chromium_src-90a253bf27e88f424afde35b561270fe52163763.zip chromium_src-90a253bf27e88f424afde35b561270fe52163763.tar.gz chromium_src-90a253bf27e88f424afde35b561270fe52163763.tar.bz2 | |
Allow multiple ChildProcess objects in one process for the --single-process case, when we have both renderer and gpu.
Review URL: http://codereview.chromium.org/6966030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/child_process.h')
| -rw-r--r-- | content/common/child_process.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/common/child_process.h b/content/common/child_process.h index e3786ae..f37d528 100644 --- a/content/common/child_process.h +++ b/content/common/child_process.h @@ -53,7 +53,7 @@ class ChildProcess { void ReleaseProcess(); // Getter for the one ChildProcess object for this process. - static ChildProcess* current() { return child_process_; } + static ChildProcess* current(); static void WaitForDebugger(const std::string& label); private: @@ -70,9 +70,6 @@ class ChildProcess { // io_thread_. scoped_ptr<ChildThread> main_thread_; - // The singleton instance for this process. - static ChildProcess* child_process_; - DISALLOW_COPY_AND_ASSIGN(ChildProcess); }; |