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

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

index e3382c9f10bb524229de2f33378552e331dbe04a..928d1df4803aafcee6e45846b5d6c30e449ecb42 100644

--- a/content/renderer/render_widget.cc

+++ b/content/renderer/render_widget.cc

@@ -92,7 +92,7 @@

#include "third_party/skia/include/core/SkPixelRef.h"

#endif // defined(OS_POSIX)

-#if defined(MOJO_SHELL_CLIENT)

+#if defined(USE_AURA)

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

#include "content/renderer/mus/render_widget_mus_connection.h"

#endif

@@ -199,7 +199,7 @@ bool IsDateTimeInput(ui::TextInputType type) {

content::RenderWidgetInputHandlerDelegate* GetRenderWidgetInputHandlerDelegate(

content::RenderWidget* widget) {

-#if defined(MOJO_SHELL_CLIENT)

+#if defined(USE_AURA)

const base::CommandLine& cmdline = *base::CommandLine::ForCurrentProcess();

if (content::MojoShellConnection::GetForProcess() &&

cmdline.HasSwitch(switches::kUseMusInRenderer)) {

« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »