Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1097)

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: Created 5 years, 6 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_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;

Powered by Google App Engine
This is Rietveld 408576698