chrome/browser/chrome_content_browser_client.cc - Issue 2138263002: Revert of Move content's shell connections to the IO thread

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_content_browser_client.cc

Issue 2138263002: Revert of Move content's shell connections to the IO thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

Index: chrome/browser/chrome_content_browser_client.cc

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

index f8af92a04931b0c22929199aa1e70f96b6998325..e1ac0da6189102ca53cbfc1457129729cc5854cd 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -159,7 +159,6 @@

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

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

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

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

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

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

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

@@ -2850,8 +2849,8 @@

#if defined(OS_CHROMEOS)

#if defined(MOJO_SHELL_CLIENT)

if (chrome::IsRunningInMash()) {

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

- base::MakeUnique<chromeos::ChromeInterfaceFactory>());

+ content::MojoShellConnection::GetForProcess()->MergeService(

+ base::WrapUnique(new chromeos::ChromeInterfaceFactory));

}

#endif // MOJO_SHELL_CLIENT

#endif // OS_CHROMEOS

« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_interface_factory.h » ('j') | no next file with comments »