diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 15:18:00 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 15:18:00 +0000 |
commit | f167520fa923e9b38f6ec86dcbf9150c0c7f2104 (patch) | |
tree | d94a0f5fd2ad3b059d34494838d61a358e7ae971 /content/browser/browser_child_process_host_impl.h | |
parent | 0d90b384d142e1c62956d817d213a95ae9c38490 (diff) | |
download | chromium_src-f167520fa923e9b38f6ec86dcbf9150c0c7f2104.zip chromium_src-f167520fa923e9b38f6ec86dcbf9150c0c7f2104.tar.gz chromium_src-f167520fa923e9b38f6ec86dcbf9150c0c7f2104.tar.bz2 |
Remove the code to wait on disconnected child processes to get the exit code. This was done in r101435 to fix a problem where we were seeing processes "quit" but the result code wasn't ready. It looks like r68831 caused this, since it made the channel be disconnected before the process exits.
Review URL: https://chromiumcodereview.appspot.com/10702048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_child_process_host_impl.h')
-rw-r--r-- | content/browser/browser_child_process_host_impl.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/content/browser/browser_child_process_host_impl.h b/content/browser/browser_child_process_host_impl.h index 877f5e4..1fc742a 100644 --- a/content/browser/browser_child_process_host_impl.h +++ b/content/browser/browser_child_process_host_impl.h @@ -10,9 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/weak_ptr.h" #include "base/process.h" -#include "base/synchronization/waitable_event_watcher.h" #include "content/browser/child_process_launcher.h" #include "content/public/browser/browser_child_process_host.h" #include "content/public/browser/child_process_data.h" @@ -28,8 +26,7 @@ class BrowserChildProcessHostIterator; class CONTENT_EXPORT BrowserChildProcessHostImpl : public content::BrowserChildProcessHost, public NON_EXPORTED_BASE(content::ChildProcessHostDelegate), - public ChildProcessLauncher::Client, - public base::WaitableEventWatcher::Delegate { + public ChildProcessLauncher::Client { public: BrowserChildProcessHostImpl( content::ProcessType type, @@ -56,8 +53,6 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl : virtual void SetName(const string16& name) OVERRIDE; virtual void SetHandle(base::ProcessHandle handle) OVERRIDE; - bool disconnect_was_alive() const { return disconnect_was_alive_; } - // Returns the handle of the child process. This can be called only after // OnProcessLaunched is called or it will be invalid and may crash. base::ProcessHandle GetHandle() const; @@ -92,21 +87,11 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl : // ChildProcessLauncher::Client implementation. virtual void OnProcessLaunched() OVERRIDE; - // public base::WaitableEventWatcher::Delegate implementation: - virtual void OnWaitableEventSignaled( - base::WaitableEvent* waitable_event) OVERRIDE; - content::ChildProcessData data_; content::BrowserChildProcessHostDelegate* delegate_; scoped_ptr<content::ChildProcessHost> child_process_host_; scoped_ptr<ChildProcessLauncher> child_process_; -#if defined(OS_WIN) - base::WaitableEventWatcher child_watcher_; -#else - base::WeakPtrFactory<BrowserChildProcessHostImpl> task_factory_; -#endif - bool disconnect_was_alive_; }; #endif // CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_IMPL_H_ |