Index: chrome/browser/renderer_host/browser_render_process_host.h |
=================================================================== |
--- chrome/browser/renderer_host/browser_render_process_host.h (revision 44239) |
+++ chrome/browser/renderer_host/browser_render_process_host.h (working copy) |
@@ -12,10 +12,11 @@ |
#include <string> |
#include "app/surface/transport_dib.h" |
+#include "base/mp/mp_child_process_launcher.h" |
#include "base/process.h" |
#include "base/scoped_ptr.h" |
#include "base/timer.h" |
-#include "chrome/browser/child_process_launcher.h" |
+#include "chrome/browser/child_process_context.h" |
#include "chrome/browser/renderer_host/render_process_host.h" |
#include "chrome/common/notification_registrar.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" |
@@ -53,7 +54,7 @@ |
// communicate through the two process objects. |
class BrowserRenderProcessHost : public RenderProcessHost, |
public NotificationObserver, |
- public ChildProcessLauncher::Client { |
+ public base::MpChildProcessLauncher::Client { |
public: |
explicit BrowserRenderProcessHost(Profile* profile); |
~BrowserRenderProcessHost(); |
@@ -98,7 +99,7 @@ |
const NotificationSource& source, |
const NotificationDetails& details); |
- // ChildProcessLauncher::Client implementation. |
+ // base::MpChildProcessLauncher::Client implementation. |
virtual void OnProcessLaunched(); |
private: |
@@ -198,7 +199,7 @@ |
bool extension_process_; |
// Usedt to launch and terminate the process without blocking the UI thread. |
- scoped_ptr<ChildProcessLauncher> child_process_; |
+ scoped_ptr<base::MpChildProcessLauncher> child_process_; |
// Messages we queue while waiting for the process handle. We queue them here |
// instead of in the channel so that we ensure they're sent after init related |
@@ -206,6 +207,8 @@ |
// because the queued messages may have dependencies on the init messages. |
std::queue<IPC::Message*> queued_messages_; |
+ ChildProcessContext context_; |
+ |
DISALLOW_COPY_AND_ASSIGN(BrowserRenderProcessHost); |
}; |