| Index: content/gpu/gpu_child_thread.h
|
| diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
|
| index 7eb8c4629f482049a007c183b2356e7e18973fff..f51bba18b6a86bf222a1e53b6100a4150a5f1821 100644
|
| --- a/content/gpu/gpu_child_thread.h
|
| +++ b/content/gpu/gpu_child_thread.h
|
| @@ -28,6 +28,7 @@
|
| #include "gpu/ipc/service/gpu_config.h"
|
| #include "gpu/ipc/service/x_util.h"
|
| #include "mojo/public/cpp/bindings/binding_set.h"
|
| +#include "mojo/public/cpp/bindings/interface_request.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| namespace gpu {
|
| @@ -86,6 +87,9 @@
|
| bool Send(IPC::Message* msg) override;
|
| bool OnControlMessageReceived(const IPC::Message& msg) override;
|
| bool OnMessageReceived(const IPC::Message& msg) override;
|
| + bool OnConnect(shell::Connection* connection) override;
|
| + shell::InterfaceRegistry* GetInterfaceRegistryForConnection() override;
|
| + shell::InterfaceProvider* GetInterfaceProviderForConnection() override;
|
|
|
| // gpu::GpuChannelManagerDelegate:
|
| void SetActiveURL(const GURL& url) override;
|
| @@ -134,7 +138,8 @@
|
| #endif
|
| void OnLoseAllContexts();
|
|
|
| - void BindProcessControlRequest(mojom::ProcessControlRequest request);
|
| + void BindProcessControlRequest(
|
| + mojo::InterfaceRequest<mojom::ProcessControl> request);
|
|
|
| gpu::GpuPreferences gpu_preferences_;
|
|
|
| @@ -174,6 +179,8 @@
|
| // Bindings to the mojom::ProcessControl impl.
|
| mojo::BindingSet<mojom::ProcessControl> process_control_bindings_;
|
|
|
| + base::Closure resume_interface_bindings_callback_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
|
| };
|
|
|
|
|