chrome/browser/chrome_browser_main.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: chrome/browser/chrome_browser_main.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: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index c7e82fed41a5b7766de40d395aea095ba96e6c8c..d1a7a6e3866a7442a68adb0d2c8ef6b4d0b92f2d 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -268,7 +268,7 @@

#include "chrome/browser/usb/web_usb_detector.h"

#endif

-#if defined(MOJO_SHELL_CLIENT)

+#if defined(USE_AURA)

#include "chrome/browser/lifetime/application_lifetime.h"

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

#include "services/shell/runner/common/client_util.h"

@@ -1224,7 +1224,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {

}

void ChromeBrowserMainParts::PreMainMessageLoopRun() {

-#if defined(MOJO_SHELL_CLIENT)

+#if defined(USE_AURA)

if (content::MojoShellConnection::GetForProcess() && shell::ShellIsRemote()) {

content::MojoShellConnection::GetForProcess()->SetConnectionLostClosure(

base::Bind(&chrome::SessionEnding));

« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »