Index: content/public/browser/content_browser_client.h |
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h |
index eff374d1c72f409e37044a2475f8b31bc7bdbca1..8727289aaaded67642c754f851db1d5caa57ff78 100644 |
--- a/content/public/browser/content_browser_client.h |
+++ b/content/public/browser/content_browser_client.h |
@@ -53,6 +53,10 @@ namespace gfx { |
class ImageSkia; |
} |
+namespace mojo { |
+class ApplicationDelegate; |
+} |
+ |
namespace net { |
class CookieOptions; |
class NetLog; |
@@ -132,6 +136,9 @@ typedef ScopedVector<net::URLRequestInterceptor> |
// the observer interfaces.) |
class CONTENT_EXPORT ContentBrowserClient { |
public: |
+ using StaticMojoApplicationMap = |
+ std::map<GURL, base::Callback<scoped_ptr<mojo::ApplicationDelegate>()>>; |
jam
2015/06/03 14:50:20
nit: by convention we put these typedefs right bef
|
+ |
virtual ~ContentBrowserClient() {} |
// Allows the embedder to set any number of custom BrowserMainParts |
@@ -578,6 +585,10 @@ class CONTENT_EXPORT ContentBrowserClient { |
ServiceRegistry* registry, |
RenderFrameHost* render_frame_host) {} |
+ // Registers in-process Mojo application loaders with the browser's global |
+ // Mojo shell. |
+ virtual void RegisterMojoApplications(StaticMojoApplicationMap* apps) {} |
+ |
// Registers additional navigator.connect service factories available in a |
// particular NavigatorConnectContext. |
virtual void GetAdditionalNavigatorConnectServices( |