content/browser/mojo/mojo_shell_context.h - Issue 1209283003: FrameMojoShell provides services to mojo apps.

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_context.h

Issue 1209283003: FrameMojoShell provides services to mojo apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 5 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:

Index: content/browser/mojo/mojo_shell_context.h

diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/mojo/mojo_shell_context.h

index ab0207bc6de5fa9257a2ea75175eac9be931411d..ce3ad4aef0f6efe3bee425408600f3405af2d7f8 100644

--- a/content/browser/mojo/mojo_shell_context.h

+++ b/content/browser/mojo/mojo_shell_context.h

@@ -41,7 +41,8 @@ class CONTENT_EXPORT MojoShellContext

static void ConnectToApplication(

const GURL& url,

const GURL& requestor_url,

- mojo::InterfaceRequest<mojo::ServiceProvider> request);

+ mojo::InterfaceRequest<mojo::ServiceProvider> request,

+ mojo::ServiceProviderPtr exposed_services);

static void SetApplicationsForTest(const StaticApplicationMap* apps);

@@ -52,7 +53,8 @@ class CONTENT_EXPORT MojoShellContext

void ConnectToApplicationOnOwnThread(

const GURL& url,

const GURL& requestor_url,

- mojo::InterfaceRequest<mojo::ServiceProvider> request);

+ mojo::InterfaceRequest<mojo::ServiceProvider> request,

+ mojo::ServiceProviderPtr exposed_services);

// mojo::shell::ApplicationManager::Delegate:

GURL ResolveMappings(const GURL& url) override;