chrome/browser/nacl_host/nacl_broker_host_win.cc - Issue 8774040: Don't make classes derive from ChildProcessHost, and instead have them use it through composition...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/nacl_host/nacl_broker_host_win.cc

Issue 8774040: Don't make classes derive from ChildProcessHost, and instead have them use it through composition... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/automation/testing_automation_provider.cc ('k') | chrome/browser/nacl_host/nacl_process_host.h » ('j') | content/browser/browser_child_process_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/nacl_host/nacl_broker_host_win.cc

===================================================================

--- chrome/browser/nacl_host/nacl_broker_host_win.cc (revision 112597)

+++ chrome/browser/nacl_host/nacl_broker_host_win.cc (working copy)

@@ -14,6 +14,7 @@

#include "chrome/common/logging_chrome.h"

#include "chrome/common/nacl_cmd_line.h"

#include "chrome/common/nacl_messages.h"

+#include "content/common/child_process_host.h"

NaClBrokerHost::NaClBrokerHost()

: BrowserChildProcessHost(content::PROCESS_TYPE_NACL_BROKER),

@@ -25,7 +26,7 @@

bool NaClBrokerHost::Init() {

// Create the channel that will be used for communicating with the broker.

- if (!CreateChannel())

+ if (!child_process_host()->CreateChannel())

return false;

// Create the path to the nacl broker/loader executable.

@@ -39,7 +40,8 @@

cmd_line->AppendSwitchASCII(switches::kProcessType,

switches::kNaClBrokerProcess);

- cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id());

+ cmd_line->AppendSwitchASCII(switches::kProcessChannelID,

+ child_process_host()->channel_id());

if (logging::DialogsAreSuppressed())

cmd_line->AppendSwitch(switches::kNoErrorDialogs);