content/browser/web_contents/web_contents_impl.cc - Issue 2208613002: Remove MOJO_SHELL_CLIENT define.

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/web_contents/web_contents_impl.cc

Issue 2208613002: Remove MOJO_SHELL_CLIENT define. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tot merge Created 4 years, 4 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:

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 19d9d26bb515dabebf7fc2b03b581dc393474d66..26e6d0a1768a028b7e8fab6b4c62e8a64d574b45 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -143,7 +143,7 @@

#include "base/mac/foundation_util.h"

#endif

-#if defined(MOJO_SHELL_CLIENT)

+#if defined(USE_AURA)

#include "content/browser/web_contents/web_contents_view_mus.h"

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

#include "ui/aura/mus/mus_util.h"

@@ -1545,7 +1545,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {

WebContentsViewDelegate* delegate =

GetContentClient()->browser()->GetWebContentsViewDelegate(this);

-#if defined(MOJO_SHELL_CLIENT)

+#if defined(USE_AURA)

if (MojoShellConnection::GetForProcess() &&

base::CommandLine::ForCurrentProcess()->HasSwitch(

switches::kUseMusInRenderer)) {

« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/child/BUILD.gn » ('j') | no next file with comments »