content/browser/mojo/mojo_shell_client_host.cc - Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

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/mojo/mojo_shell_client_host.cc

Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojom

Patch Set: . Created 4 years, 10 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: content/browser/mojo/mojo_shell_client_host.cc

diff --git a/content/browser/mojo/mojo_shell_client_host.cc b/content/browser/mojo/mojo_shell_client_host.cc

index 2c7a1216acf1fd880413f1e31094752b49d79f3c..f8b67db20f226908999de7a2de33e10cda6df9fe 100644

--- a/content/browser/mojo/mojo_shell_client_host.cc

+++ b/content/browser/mojo/mojo_shell_client_host.cc

@@ -21,7 +21,7 @@

#include "mojo/edk/embedder/embedder.h"

#include "mojo/edk/embedder/platform_channel_pair.h"

#include "mojo/edk/embedder/scoped_platform_handle.h"

-#include "mojo/shell/public/cpp/application_impl.h"

+#include "mojo/shell/public/cpp/shell.h"

#include "mojo/shell/public/interfaces/application_manager.mojom.h"

namespace content {

@@ -119,7 +119,7 @@ void ConnectChildToShell(

return;

mojo::shell::mojom::ApplicationManagerPtr application_manager;

- MojoShellConnection::Get()->GetApplication()->ConnectToService(

+ MojoShellConnection::Get()->GetShell()->ConnectToService(

"mojo:shell", &application_manager);

// The content of the URL/qualifier we pass is actually meaningless, it's only

« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/renderer_host/render_widget_host_view_mus.cc » ('j') | no next file with comments »