content/renderer/renderer_main.cc - Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2]

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/renderer/renderer_main.cc

Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Don't create a RenderWidgetWindowTreeeClientFactory in tests Created 5 years, 1 month 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

« content/common/render_widget_window_tree_client_factory.mojom ('K') | « content/renderer/render_widget_window_tree_client_factory.cc ('k') | ui/aura/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/renderer_main.cc

diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc

index ea7c913adfb26058120daa11d6786648cf9b1495..8fb158d3182e26fb24b50155296d20330e04ded9 100644

--- a/content/renderer/renderer_main.cc

+++ b/content/renderer/renderer_main.cc

@@ -58,6 +58,10 @@

#include "ui/ozone/public/client_native_pixmap_factory.h"

#endif

+#if defined(MOJO_SHELL_CLIENT)

+#include "content/common/mojo/mojo_shell_connection_impl.h"

+#endif

namespace content {

namespace {

// This function provides some ways to test crash and assertion handling

@@ -90,6 +94,10 @@ int RendererMain(const MainFunctionParams& parameters) {

base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex(

kTraceEventRendererProcessSortIndex);

+#if defined(MOJO_SHELL_CLIENT)

+ MojoShellConnectionImpl::Create();

+#endif

const base::CommandLine& parsed_command_line = parameters.command_line;

#if defined(OS_MACOSX)