Index: content/browser/frame_host/frame_mojo_shell.h |
diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h |
index 3c209d2e752ab1f427be7a7508c11e94348a0817..c129178ff13b4fa4058af8c8f6b26796d7355f17 100644 |
--- a/content/browser/frame_host/frame_mojo_shell.h |
+++ b/content/browser/frame_host/frame_mojo_shell.h |
@@ -6,6 +6,7 @@ |
#define CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ |
#include "base/macros.h" |
+#include "base/memory/scoped_ptr.h" |
#include "mojo/application/public/interfaces/shell.mojom.h" |
#include "mojo/common/weak_binding_set.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" |
@@ -13,6 +14,7 @@ |
namespace content { |
class RenderFrameHost; |
+class ServiceRegistryImpl; |
// This provides the |mojo::Shell| service interface to each frame's |
// ServiceRegistry, giving frames the ability to connect to Mojo applications. |
@@ -31,9 +33,14 @@ class FrameMojoShell : public mojo::Shell { |
mojo::ServiceProviderPtr exposed_services) override; |
void QuitApplication() override; |
+ ServiceRegistryImpl* GetServiceRegistry(); |
+ |
RenderFrameHost* frame_host_; |
mojo::WeakBindingSet<mojo::Shell> bindings_; |
+ // ServiceRegistry providing browser services to connected applications. |
+ scoped_ptr<ServiceRegistryImpl> service_registry_; |
xhwang
2015/06/29 20:25:51
I am debating between doing this and using the ser
Ken Rockot(use gerrit already)
2015/07/06 18:58:00
What you're doing here seems right to me. We shoul
xhwang
2015/07/07 19:21:04
Acknowledged.
|
+ |
Ken Rockot(use gerrit already)
2015/07/06 18:58:00
Actually I think ServiceRegistry is overkill here
xhwang
2015/07/07 19:21:04
As discussed offline, the current ServiceProviderI
|
DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); |
}; |