Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Unified Diff: content/browser/utility_process_host_impl.cc

Issue 19502003: Cut some more dependencies from browser to child for multiple_dll mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 5 months 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/utility_process_host_impl.h ('k') | content/content.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/utility_process_host_impl.cc
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc
index 6e9dfa725d75f3d6f98e0fecadef85e91dc6efba..0f3cdbd4a6a139030c0e53f7cdf9cca6e2ee321c 100644
--- a/content/browser/utility_process_host_impl.cc
+++ b/content/browser/utility_process_host_impl.cc
@@ -58,6 +58,8 @@ private:
// are many globals used in the utility process.
static base::LazyInstance<base::Lock> g_one_utility_thread_lock;
+// Single process not supported in multiple dll mode currently.
+#if !defined(CHROME_MULTIPLE_DLL)
class UtilityMainThread : public base::Thread {
public:
UtilityMainThread(const std::string& channel_id)
@@ -98,6 +100,7 @@ class UtilityMainThread : public base::Thread {
DISALLOW_COPY_AND_ASSIGN(UtilityMainThread);
};
+#endif // !CHROME_MULTIPLE_DLL
UtilityProcessHost* UtilityProcessHost::Create(
UtilityProcessHostClient* client,
@@ -193,12 +196,16 @@ bool UtilityProcessHostImpl::StartProcess() {
if (channel_id.empty())
return false;
+ // Multiple
jam 2013/07/23 15:19:36 nit: comment cut off?
scottmg 2013/07/23 15:33:15 wat Done.
+#if !defined(CHROME_MULTIPLE_DLL)
if (RenderProcessHost::run_renderer_in_process()) {
// See comment in RenderProcessHostImpl::Init() for the background on why we
// support single process mode this way.
in_process_thread_.reset(new UtilityMainThread(channel_id));
in_process_thread_->Start();
- } else {
+ } else
+#endif // !CHROME_MULTIPLE_DLL
+ {
const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
int child_flags = child_flags_;
« no previous file with comments | « content/browser/utility_process_host_impl.h ('k') | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698