| 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 a3e2912fdf8b5deff1798dd45f323af612d8bd97..9893ae2fa51bfd473880de0e6fd3854452bc6a0f 100644
|
| --- a/content/browser/frame_host/frame_mojo_shell.h
|
| +++ b/content/browser/frame_host/frame_mojo_shell.h
|
| @@ -7,8 +7,8 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "mojo/public/cpp/bindings/binding_set.h"
|
| #include "mojo/public/cpp/bindings/interface_request.h"
|
| -#include "mojo/public/cpp/bindings/weak_binding_set.h"
|
| #include "mojo/shell/public/interfaces/shell.mojom.h"
|
|
|
| namespace content {
|
| @@ -45,12 +45,12 @@ class FrameMojoShell : public mojo::shell::mojom::Shell,
|
| ServiceRegistryImpl* GetServiceRegistry();
|
|
|
| RenderFrameHost* frame_host_;
|
| - mojo::WeakBindingSet<mojo::shell::mojom::Shell> bindings_;
|
| - mojo::WeakBindingSet<mojo::shell::mojom::Connector> connectors_;
|
| + mojo::BindingSet<mojo::shell::mojom::Shell> bindings_;
|
| + mojo::BindingSet<mojo::shell::mojom::Connector> connectors_;
|
|
|
| // ServiceRegistry providing browser services to connected applications.
|
| scoped_ptr<ServiceRegistryImpl> service_registry_;
|
| - mojo::WeakBindingSet<mojo::shell::mojom::InterfaceProvider>
|
| + mojo::BindingSet<mojo::shell::mojom::InterfaceProvider>
|
| service_provider_bindings_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FrameMojoShell);
|
|
|