| Index: content/browser/renderer_host/render_process_host_impl.h
|
| ===================================================================
|
| --- content/browser/renderer_host/render_process_host_impl.h (revision 144915)
|
| +++ content/browser/renderer_host/render_process_host_impl.h (working copy)
|
| @@ -12,7 +12,6 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/process.h"
|
| -#include "base/synchronization/waitable_event_watcher.h"
|
| #include "base/timer.h"
|
| #include "content/browser/child_process_launcher.h"
|
| #include "content/common/content_export.h"
|
| @@ -24,10 +23,6 @@
|
| class GpuMessageFilter;
|
| class RenderWidgetHelper;
|
|
|
| -namespace base {
|
| -class WaitableEvent;
|
| -}
|
| -
|
| namespace content {
|
| class RendererMainThread;
|
| class RenderWidgetHost;
|
| @@ -49,8 +44,7 @@
|
| // communicate through the two process objects.
|
| class CONTENT_EXPORT RenderProcessHostImpl
|
| : public RenderProcessHost,
|
| - public ChildProcessLauncher::Client,
|
| - public base::WaitableEventWatcher::Delegate {
|
| + public ChildProcessLauncher::Client {
|
| public:
|
| RenderProcessHostImpl(BrowserContext* browser_context, bool is_guest);
|
| virtual ~RenderProcessHostImpl();
|
| @@ -107,10 +101,6 @@
|
| // ChildProcessLauncher::Client implementation.
|
| virtual void OnProcessLaunched() OVERRIDE;
|
|
|
| - // base::WaitableEventWatcher::Delegate implementation.
|
| - virtual void OnWaitableEventSignaled(
|
| - base::WaitableEvent* waitable_event) OVERRIDE;
|
| -
|
| // Call this function when it is evident that the child process is actively
|
| // performing some operation, for example if we just received an IPC message.
|
| void mark_child_process_activity_time() {
|
| @@ -210,12 +200,8 @@
|
| // Callers can reduce the RenderProcess' priority.
|
| void SetBackgrounded(bool backgrounded);
|
|
|
| - // Handle termination of our process. |was_alive| indicates that when we
|
| - // tried to retrieve the exit code the process had not finished yet.
|
| - void ProcessDied(base::ProcessHandle handle,
|
| - base::TerminationStatus status,
|
| - int exit_code,
|
| - bool was_alive);
|
| + // Handle termination of our process.
|
| + void ProcessDied();
|
|
|
| // The count of currently visible widgets. Since the host can be a container
|
| // for multiple widgets, it uses this count to determine when it should be
|
| @@ -268,11 +254,6 @@
|
| // because the queued messages may have dependencies on the init messages.
|
| std::queue<IPC::Message*> queued_messages_;
|
|
|
| -#if defined(OS_WIN)
|
| - // Used to wait until the renderer dies to get an accurrate exit code.
|
| - base::WaitableEventWatcher child_process_watcher_;
|
| -#endif
|
| -
|
| // The globally-unique identifier for this RPH.
|
| int id_;
|
|
|
|
|