chrome/browser/chrome_content_browser_client.cc - Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash

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 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)

Patch Set: rebase again Created 4 years, 2 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_content_browser_client.cc

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

index 2c0ceec8b62143d0c429ebba845af7e5a557edf2..135a0ccca171dfc7600b12ebada6104a8afccd0a 100644

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

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

@@ -3023,10 +3023,8 @@ void ChromeContentBrowserClient::RegisterInProcessMojoApplications(

apps->insert(std::make_pair("mojo:media", app_info));

#endif

#if defined(OS_CHROMEOS)

- if (chrome::IsRunningInMash()) {

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

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

- }

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

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

#endif // OS_CHROMEOS

}