| Index: content/renderer/render_thread_impl.h
|
| diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
|
| index 5bd84a603407a8f87f2b27291721ad3aababb4f0..c64f9d7c53191e811f1fa485e5a8baf54f156152 100644
|
| --- a/content/renderer/render_thread_impl.h
|
| +++ b/content/renderer/render_thread_impl.h
|
| @@ -446,8 +446,8 @@ class CONTENT_EXPORT RenderThreadImpl
|
|
|
| void RegisterPendingRenderFrameConnect(
|
| int routing_id,
|
| - mojo::InterfaceRequest<mojo::InterfaceProvider> services,
|
| - mojo::InterfaceProviderPtr exposed_services);
|
| + mojo::shell::mojom::InterfaceProviderRequest services,
|
| + mojo::shell::mojom::InterfaceProviderPtr exposed_services);
|
|
|
| protected:
|
| RenderThreadImpl(const InProcessChildThreadParams& params,
|
| @@ -669,14 +669,16 @@ class CONTENT_EXPORT RenderThreadImpl
|
| public:
|
| PendingRenderFrameConnect(
|
| int routing_id,
|
| - mojo::InterfaceRequest<mojo::InterfaceProvider> services,
|
| - mojo::InterfaceProviderPtr exposed_services);
|
| + mojo::shell::mojom::InterfaceProviderRequest services,
|
| + mojo::shell::mojom::InterfaceProviderPtr exposed_services);
|
|
|
| - mojo::InterfaceRequest<mojo::InterfaceProvider>& services() {
|
| + mojo::shell::mojom::InterfaceProviderRequest& services() {
|
| return services_;
|
| }
|
|
|
| - mojo::InterfaceProviderPtr& exposed_services() { return exposed_services_; }
|
| + mojo::shell::mojom::InterfaceProviderPtr& exposed_services() {
|
| + return exposed_services_;
|
| + }
|
|
|
| private:
|
| friend class base::RefCounted<PendingRenderFrameConnect>;
|
| @@ -687,8 +689,8 @@ class CONTENT_EXPORT RenderThreadImpl
|
| void OnConnectionError();
|
|
|
| int routing_id_;
|
| - mojo::InterfaceRequest<mojo::InterfaceProvider> services_;
|
| - mojo::InterfaceProviderPtr exposed_services_;
|
| + mojo::shell::mojom::InterfaceProviderRequest services_;
|
| + mojo::shell::mojom::InterfaceProviderPtr exposed_services_;
|
| };
|
|
|
| typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>>
|
|
|