content/browser/utility_process_host.cc - Issue 8787004: Make ChildProcessHost be used through an interface in content/public, instead of by inheritence.

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: content/browser/utility_process_host.cc

Issue 8787004: Make ChildProcessHost be used through an interface in content/public, instead of by inheritence. (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 | « content/browser/renderer_host/resource_dispatcher_host_unittest.cc ('k') | content/browser/worker_host/worker_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/utility_process_host.cc

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

--- content/browser/utility_process_host.cc (revision 112775)

+++ content/browser/utility_process_host.cc (working copy)

@@ -9,7 +9,7 @@

#include "base/command_line.h"

#include "base/message_loop.h"

#include "base/utf_string_conversions.h"

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

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

#include "content/common/utility_messages.h"

#include "content/public/browser/content_browser_client.h"

#include "content/public/common/content_switches.h"

@@ -18,6 +18,7 @@

#include "webkit/plugins/plugin_switches.h"

using content::BrowserThread;

+using content::ChildProcessHost;

UtilityProcessHost::Client::Client() {

}

@@ -87,7 +88,8 @@

// launches a UtilityProcessHost.

set_name(ASCIIToUTF16("utility process"));

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

+ std::string channel_id = child_process_host()->CreateChannel();

+ if (channel_id.empty())

return false;

FilePath exe_path = GetUtilityProcessCmd();

@@ -99,8 +101,7 @@

CommandLine* cmd_line = new CommandLine(exe_path);

cmd_line->AppendSwitchASCII(switches::kProcessType,

switches::kUtilityProcess);

- cmd_line->AppendSwitchASCII(switches::kProcessChannelID,

- child_process_host()->channel_id());

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

std::string locale =

content::GetContentClient()->browser()->GetApplicationLocale();

cmd_line->AppendSwitchASCII(switches::kLang, locale);